[cups-pdf] update to 2.6.1
Remi Collet
remi at fedoraproject.org
Thu Jan 5 06:16:50 UTC 2012
commit 68f39b9e3202a29a19a9ecd4e8f446a974dd276f
Author: remi <fedora at famillecollet.com>
Date: Thu Jan 5 07:16:29 2012 +0100
update to 2.6.1
.gitignore | 2 ++
cups-pdf.spec | 16 +++++++++-------
sources | 2 +-
3 files changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 12ccd78..e82e379 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
+*spec~
cups-pdf_2.5.0.tar.gz
/cups-pdf_2.5.1.tar.gz
+/cups-pdf_2.6.1.tar.gz
diff --git a/cups-pdf.spec b/cups-pdf.spec
index 6d2d19b..851b94c 100644
--- a/cups-pdf.spec
+++ b/cups-pdf.spec
@@ -1,10 +1,10 @@
Summary: Extension for creating pdf-Files with CUPS
Summary(fr): Extension de CUPS pour créer des fichiers PDF
Name: cups-pdf
-Version: 2.5.1
+Version: 2.6.1
Release: 1%{?dist}
Group: Applications/Publishing
-URL: http://cip.physik.uni-wuerzburg.de/~vrbehr/cups-pdf/
+URL: http://www.cups-pdf.de/
License: GPLv2+
Source0: http://www.physik.uni-wuerzburg.de/~vrbehr/cups-pdf/src/%{name}_%{version}.tar.gz
@@ -17,6 +17,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: cups-devel
Requires: ghostscript, cups
+Requires(post): %{_bindir}/pgrep
# These are the defaults paths defined in config.h
@@ -95,17 +96,14 @@ rm -rf %{buildroot}
%post
# First install : create the printer if cupsd is running
-if [ "$1" -eq "1" -a -f "%{_var}/run/cupsd.pid" ]
+if [ "$1" -eq "1" ] && %{_bindir}/pgrep -u root -f %{_sbindir}/cupsd >/dev/null
then
%if 0%{?fedora}%{?rhel} < 5
# Restart CUPS on old Fedora/RHEL to discover the new "backend"
/sbin/service cups condrestart
%endif
- if [ -d /proc/$(cat %{_var}/run/cupsd.pid) ]
- then
- /usr/sbin/lpadmin -p Cups-PDF -v cups-pdf:/ -m CUPS-PDF.ppd -E || :
- fi
+ /usr/sbin/lpadmin -p Cups-PDF -v cups-pdf:/ -m CUPS-PDF.ppd -E || :
fi
@@ -127,6 +125,10 @@ fi
%changelog
+* Thu Jan 05 2012 Remi Collet <Fedora at FamilleCollet.com> 2.6.1-1
+- update to 2.6.1
+- fix %%post scriptlet (#757760)
+
* Sat Feb 19 2011 Remi Collet <Fedora at FamilleCollet.com> 2.5.1-1
- update to 2.5.1 (bugfix)
- remove old SELinux stuff from spec
diff --git a/sources b/sources
index 37cf624..5261f6f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4b4cf1a249d02a38045db74b5f259aac cups-pdf_2.5.1.tar.gz
+65f3fd525c4a9b1d736b91594b3166d5 cups-pdf_2.6.1.tar.gz
More information about the scm-commits
mailing list