rpmbuild/cups
Archived
1
0
Fork 0
Code Issues Pull Requests Releases 14 Activity

fix: fix german localization template #7

Merged
xoxys merged 2 commits from fix-locale into master 2021-12-16 10:22:10 +00:00
Conversation 0 Commits 2 Files Changed 6 +67 -9
5 changed files with 67 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f200c8bcff - Show all commits

3
.drone.jsonnet
View File

@ -23,8 +23,7 @@ local DistVersion(version='7') = {
name: 'build-el' + version,
image: 'thegeeklab/rpmbuild:' + version,
commands: [
'source /drone/src/.drone.env',
'rpmbuild -ba --without libusb1 --define "version_ $${CUPS_VERSION##v}" cups.spec',
'make all',
'ls -l /drone/src/dist/RPMS/x86_64/',
],
};

8
.drone.yml
View File

@ -30,15 +30,13 @@ steps:
- name: build-el7
image: thegeeklab/rpmbuild:7
commands:
- source /drone/src/.drone.env
- rpmbuild -ba --without libusb1 --define "version_ $${CUPS_VERSION##v}" cups.spec
- make all
- ls -l /drone/src/dist/RPMS/x86_64/
- name: build-el8
image: thegeeklab/rpmbuild:8
commands:
- source /drone/src/.drone.env
- rpmbuild -ba --without libusb1 --define "version_ $${CUPS_VERSION##v}" cups.spec
- make all
- ls -l /drone/src/dist/RPMS/x86_64/
- name: checksum
@ -122,6 +120,6 @@ depends_on:
---
kind: signature
hmac: e3a4496149a9d12470fe6ccf27240160f1a52e62320541e0828c1bc65e2696e1
hmac: 88093dd0dd68991c61958ba9412b054a6a0ead47acb8590b5fa775492d2dc7a8
...

19
Makefile Normal file
View File

@ -0,0 +1,19 @@
WORKDIR := /drone/src
BASEDIR := dist
.PHONY: all
all: prepare build
.PHONY: prepare
prepare:
mkdir -p $(WORKDIR)/$(BASEDIR)/{BUILD,RPMS,SOURCES,SPECS,SRPMS}; \
rsync -avHAX -q --ignore-missing-args $(WORKDIR)/patches/ $(WORKDIR)/$(BASEDIR)/SOURCES/
.PHONY: build
build:
source $(WORKDIR)/.drone.env && \
rpmbuild -ba --without libusb1 --define "version_ $${CUPS_VERSION##v}" cups.spec
.PHONY: clean
clean:
rm -rf $(WORKDIR)/$(BASEDIR)

6
cups.spec
View File

@ -44,13 +44,14 @@
Summary: CUPS
Name: cups
Version: %{version_}
Release: 1%{?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: Anonymous <anonymous@example.com>
Packager: Robert Kaussow <mail@thegeeklab.de>
Vendor: OpenPrinting
# Package names are as defined for Red Hat (and clone) distributions
@ -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" \

40
patches/fix-german-localization.patch Normal 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">