chore(deps): update dependency openprinting/cups to v2.4.7 (#15)

Reviewed-on: #15
Co-authored-by: Renovator Bot <renovator@rknet.org>
Co-committed-by: Renovator Bot <renovator@rknet.org>

.drone.env

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

.drone.jsonnet

@@ -23,8 +23,7 @@ local DistVersion(version='7') = {
   name: 'build-el' + version,
   image: 'thegeeklab/rpmbuild:' + version,
   commands: [
-    'source /drone/src/.drone.env',
+    'make all',
-    'rpmbuild -ba --without libusb1 --define "version_ $${CUPS_VERSION##v}" cups.spec',
     'ls -l /drone/src/dist/RPMS/x86_64/',
   ],
 };
@@ -108,7 +107,7 @@ local PipelineNotifications = {
       settings: {
         homeserver: { from_secret: 'matrix_homeserver' },
         roomid: { from_secret: 'matrix_roomid' },
-        template: 'Status: **{{ build.Status }}**<br/> Build: [{{ repo.Owner }}/{{ repo.Name }}]({{ build.Link }}){{#if build.Branch}} ({{ build.Branch }}){{/if}} by {{ commit.Author }}<br/> Message: {{ commit.Message.Title }}',
+        template: 'Status: **{{ .Build.Status }}**<br/> Build: [{{ .Repo.Owner }}/{{ .Repo.Name }}]({{ .Build.Link }}){{ if .Build.Branch }} ({{ .Build.Branch }}){{ end }} by {{ .Commit.Author }}<br/> Message: {{ .Commit.Message.Title }}',
         username: { from_secret: 'matrix_username' },
         password: { from_secret: 'matrix_password' },
       },

.drone.yml

@@ -30,15 +30,13 @@ steps:
   - name: build-el7
     image: thegeeklab/rpmbuild:7
     commands:
-      - source /drone/src/.drone.env
+      - make all
-      - rpmbuild -ba --without libusb1 --define "version_ $${CUPS_VERSION##v}" cups.spec
       - ls -l /drone/src/dist/RPMS/x86_64/
 
   - name: build-el8
     image: thegeeklab/rpmbuild:8
     commands:
-      - source /drone/src/.drone.env
+      - make all
-      - rpmbuild -ba --without libusb1 --define "version_ $${CUPS_VERSION##v}" cups.spec
       - ls -l /drone/src/dist/RPMS/x86_64/
 
   - name: checksum
@@ -101,7 +99,7 @@ steps:
         from_secret: matrix_password
       roomid:
         from_secret: matrix_roomid
-      template: "Status: **{{ build.Status }}**<br/> Build: [{{ repo.Owner }}/{{ repo.Name }}]({{ build.Link }}){{#if build.Branch}} ({{ build.Branch }}){{/if}} by {{ commit.Author }}<br/> Message: {{ commit.Message.Title }}"
+      template: "Status: **{{ .Build.Status }}**<br/> Build: [{{ .Repo.Owner }}/{{ .Repo.Name }}]({{ .Build.Link }}){{ if .Build.Branch }} ({{ .Build.Branch }}){{ end }} by {{ .Commit.Author }}<br/> Message: {{ .Commit.Message.Title }}"
       username:
         from_secret: matrix_username
     when:
@@ -122,6 +120,6 @@ depends_on:
 
 ---
 kind: signature
-hmac: e3a4496149a9d12470fe6ccf27240160f1a52e62320541e0828c1bc65e2696e1
+hmac: ae411b705b8d3e347ad85503dac21d286bffe6a0aa69949ed86617b9e23d581b
 
 ...

Makefile

@@ -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 "release_ $${CUPS_RELEASE:-0}" --define "version_ $${CUPS_VERSION##v}" cups.spec
+
+.PHONY: clean
+clean:
+	rm -rf $(WORKDIR)/$(BASEDIR)

README.md

@@ -7,6 +7,13 @@
 
 This repository is a simple wrapper to provide CI driven RMP builds from upstream releases.
 
+## Build
+
+```Shell
+docker run -v $(pwd):/drone/src --workdir /drone/src -it thegeeklab/rpmbuild:7 make all
+docker run -v $(pwd):/drone/src --workdir /drone/src -it thegeeklab/rpmbuild:8 make all
+```
+
 ## License
 
 This project is licensed under the MIT License - see the [LICENSE](https://gitea.rknet.org/rpmbuild/cups/src/branch/master/LICENSE) file for details.

cups.spec

@@ -44,13 +44,13 @@
 Summary: CUPS
 Name: cups
 Version: %{version_}
-Release: 0%{?dist}
+Release: %{release_}%{?dist}
 Epoch: 1
 License: GPL
 Group: System Environment/Daemons
 Source: https://github.com/OpenPrinting/cups/releases/download/v%{version}/cups-%{version}-source.tar.gz
 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
@@ -132,7 +132,7 @@ make
 rm -rf $RPM_BUILD_ROOT
 
 make BUILDROOT=$RPM_BUILD_ROOT install
-rm -rf $RPM_BUILD_ROOT/usr/share/cups/banners $RPM_BUILD_ROOT/usr/share/cups/data
+rm -rf $RPM_BUILD_ROOT/usr/share/cups/data
 
 %post
 %if %{?_with_systemd:1}%{!?_with_systemd:0}
@@ -262,6 +262,7 @@ rm -rf $RPM_BUILD_ROOT
 
 /usr/sbin/*
 %dir /usr/share/cups
+%dir /usr/share/cups/banners
 %dir /usr/share/cups/drv
 /usr/share/cups/drv/*
 %dir /usr/share/cups/ipptool