Compare commits
10 Commits
Author | SHA1 | Date | |
---|---|---|---|
b388a6a2d8 | |||
e42d325030 | |||
d37f7eed35 | |||
30216648f2 | |||
5c2befe23d | |||
28a0e262bd | |||
b21fd31898 | |||
267805319b | |||
dae9026410 | |||
4556772ee8 |
@ -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)"
|
||||
|
@ -107,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' },
|
||||
},
|
||||
|
@ -99,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:
|
||||
@ -120,6 +120,6 @@ depends_on:
|
||||
|
||||
---
|
||||
kind: signature
|
||||
hmac: 88093dd0dd68991c61958ba9412b054a6a0ead47acb8590b5fa775492d2dc7a8
|
||||
hmac: ae411b705b8d3e347ad85503dac21d286bffe6a0aa69949ed86617b9e23d581b
|
||||
|
||||
...
|
||||
|
2
Makefile
2
Makefile
@ -12,7 +12,7 @@ prepare:
|
||||
.PHONY: build
|
||||
build:
|
||||
source $(WORKDIR)/.drone.env && \
|
||||
rpmbuild -ba --without libusb1 --define "version_ $${CUPS_VERSION##v}" cups.spec
|
||||
rpmbuild -ba --without libusb1 --define "release_ $${CUPS_RELEASE:-0}" --define "version_ $${CUPS_VERSION##v}" cups.spec
|
||||
|
||||
.PHONY: clean
|
||||
clean:
|
||||
|
@ -44,12 +44,11 @@
|
||||
Summary: CUPS
|
||||
Name: cups
|
||||
Version: %{version_}
|
||||
Release: 2%{?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
|
||||
Patch0: fix-german-localization.patch
|
||||
Url: http://www.cups.org
|
||||
Packager: Robert Kaussow <mail@thegeeklab.de>
|
||||
Vendor: OpenPrinting
|
||||
@ -115,7 +114,6 @@ This package provides LPD client support.
|
||||
|
||||
%prep
|
||||
%setup
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_OPT_FLAGS" \
|
||||
|
0
patches/.keep
Normal file
0
patches/.keep
Normal file
@ -1,40 +0,0 @@
|
||||
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">
|
Reference in New Issue
Block a user