Compare commits

..

No commits in common. "v2.4.1" and "v2.4.0-2" have entirely different histories.

5 changed files with 45 additions and 4 deletions

View File

@ -1,3 +1,2 @@
# renovate: datasource=github-releases depName=OpenPrinting/cups versioning=loose
export CUPS_VERSION="${CUPS_VERSION:-v2.4.1}"
export CUPS_RELEASE="$(awk -F"-" '{print $2}' <<< $DRONE_TAG)"
export CUPS_VERSION="${CUPS_VERSION:-v2.4.0}"

View File

@ -12,7 +12,7 @@ prepare:
.PHONY: build
build:
source $(WORKDIR)/.drone.env && \
rpmbuild -ba --without libusb1 --define "release_ $${CUPS_RELEASE:-0}" --define "version_ $${CUPS_VERSION##v}" cups.spec
rpmbuild -ba --without libusb1 --define "version_ $${CUPS_VERSION##v}" cups.spec
.PHONY: clean
clean:

View File

@ -44,11 +44,12 @@
Summary: CUPS
Name: cups
Version: %{version_}
Release: %{release_}%{?dist}
Release: 2%{?dist}
Epoch: 1
License: GPL
Group: System Environment/Daemons
Source: https://github.com/OpenPrinting/cups/releases/download/v%{version}/cups-%{version}-source.tar.gz
Patch0: fix-german-localization.patch
Url: http://www.cups.org
Packager: Robert Kaussow <mail@thegeeklab.de>
Vendor: OpenPrinting
@ -114,6 +115,7 @@ This package provides LPD client support.
%prep
%setup
%patch0 -p1
%build
CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_OPT_FLAGS" \

View File

View File

@ -0,0 +1,40 @@
From aa2507530076eaff042b096de55442dc8b665abb Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Wed, 1 Dec 2021 12:00:16 +0100
Subject: [PATCH] de/index.html: Fix missing bracket (fixes issue #299)
The bracket was unintentionally removed by commit b76a97a.
---
CHANGES.md | 5 +++++
doc/de/index.html.in | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/CHANGES.md b/CHANGES.md
index d4eb9aae0..c49b902f5 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,11 @@
CHANGES - OpenPrinting CUPS 2.4.0 - 2021-11-29
==============================================
+Changes in CUPS v2.4.1 (TBA)
+----------------------------
+
+- Fixed missing bracket in de/index.html (Issue #299)
+
Changes in CUPS v2.4.0 (29th November 2021)
-------------------------------------------
diff --git a/doc/de/index.html.in b/doc/de/index.html.in
index 30f7d288e..2b3f3a6b1 100644
--- a/doc/de/index.html.in
+++ b/doc/de/index.html.in
@@ -7,7 +7,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=9">
<meta name="viewport" content="width=device-width">
- <title>Startseite - CUPS @CUPS_VERSION@/title>
+ <title>Startseite - CUPS @CUPS_VERSION@</title>
</head>
<body>
<div class="header">