rpms/cups-pdf/F-8 cups-pdf.spec,1.9,1.10 sources,1.5,1.6

[Remi Collet (remi)]

Author: remi

Update of /cvs/extras/rpms/cups-pdf/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14934

Modified Files:
	cups-pdf.spec sources 
Log Message:
	update to 2.4.7



Index: cups-pdf.spec
===================================================================
RCS file: /cvs/extras/rpms/cups-pdf/F-8/cups-pdf.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- cups-pdf.spec	4 Dec 2007 18:39:23 -0000	1.9
+++ cups-pdf.spec	24 Mar 2008 12:42:05 -0000	1.10
@@ -1,19 +1,24 @@
 # Module SElinux
 %define semodule  cups_pdf
-%define seversion %{version}.1
+%define seversion 2.4.7
 
-%if %{?fedora}%{?rhel} >= 5
-%define usesel 1
-%else
 %define usesel 0
+%if 0%{?fedora} == 7
+%define usesel 1
+%endif
+%if 0%{?fedora} == 8
+%define usesel 1
+%endif
+%if 0%{?rhel} == 5
+%define usesel 1
 %endif
 
 
 Summary:        Extension for creating pdf-Files with CUPS
 Summary(fr):    Extension de CUPS pour créer des fichiers PDF
 Name:           cups-pdf
-Version:        2.4.6
-Release:        6%{?dist}
+Version:        2.4.7
+Release:        1%{?dist}
 Group:          Applications/Publishing
 Source0:        http://www.physik.uni-wuerzburg.de/~vrbehr/cups-pdf/src/%{name}_%{version}.tar.gz
 Source1:        INSTALL.cups-pdf
@@ -115,10 +120,9 @@
 %{__mkdir_p} %{buildroot}%{CPBACKEND}
 %{__mkdir_p} %{buildroot}%{ETCCUPS}
 %{__mkdir_p} %{buildroot}%{_datadir}/cups/model/
-%{__install} -m644 extra/PostscriptColor.ppd %{buildroot}%{_datadir}/cups/model/PostscriptColor.ppd
-# %{__gzip} -d %{buildroot}%{_datadir}/cups/model/PostscriptColor.ppd.gz
-%{__install} -m644 extra/cups-pdf.conf %{buildroot}%{ETCCUPS}/cups-pdf.conf
-%{__install} -m755 src/cups-pdf %{buildroot}%{CPBACKEND}
+%{__install} -m644 extra/CUPS-PDF.ppd %{buildroot}%{_datadir}/cups/model/
+%{__install} -m644 extra/cups-pdf.conf %{buildroot}%{ETCCUPS}/
+%{__install} -m700 src/cups-pdf %{buildroot}%{CPBACKEND}/
 
 %if %{usesel}
 # SElinux 
@@ -134,7 +138,7 @@
 %post
 %if %{usesel}
 # Install/update Selinux policy
-semodule -i %{_datadir}/selinux/packages/%{name}/%{semodule}.pp || :
+semodule -i %{_datadir}/selinux/packages/%{name}/%{semodule}.pp &>/dev/null || :
 fixfiles -R %{name} restore
 %endif
 
@@ -149,7 +153,7 @@
 
     if [ -d /proc/$(cat %{_var}/run/cupsd.pid) ]
     then
-        /usr/sbin/lpadmin -p Cups-PDF -v cups-pdf:/ -m PostscriptColor.ppd -E || :
+        /usr/sbin/lpadmin -p Cups-PDF -v cups-pdf:/ -m CUPS-PDF.ppd -E || :
     fi
 fi
 
@@ -173,13 +177,25 @@
 %dir %{CPOUT}
 %attr(700, root, root) %{CPBACKEND}/cups-pdf
 %config(noreplace) %{ETCCUPS}/cups-pdf.conf
-%{_datadir}/cups/model/PostscriptColor.ppd
+%{_datadir}/cups/model/CUPS-PDF.ppd
 %if %{usesel}
 %{_datadir}/selinux/packages/%{name}/%{semodule}.pp
 %endif
 
 
 %changelog
+* Mon Mar 24 2008 Remi Collet <Fedora at FamilleCollet.com> 2.4.7-1
+- update to 2.4.7
+
+* Mon Mar 17 2008 Remi Collet <Fedora at FamilleCollet.com> 2.4.6-7
+- remove SElinux on F >= 9 (in selinux-policy, see #436671)
+
+* Sat Feb  9 2008 Remi Collet <Fedora at FamilleCollet.com> 2.4.6-6.fc9.2
+- rebuild with gcc-4.3
+
+* Thu Dec 06 2007 Remi Collet <Fedora at FamilleCollet.com> 2.4.6-6.fc9.1
+- change module version from 2.4.6.1 to 2.4.7
+
 * Tue Dec 04 2007 Remi Collet <Fedora at FamilleCollet.com> 2.4.6-6
 - handle unconfined_home_dir_t and unconfined_home_t
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cups-pdf/F-8/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	6 May 2007 07:00:34 -0000	1.5
+++ sources	24 Mar 2008 12:42:05 -0000	1.6
@@ -1 +1 @@
-610a2e1d9ecd27ab978efaa6d93ddba3  cups-pdf_2.4.6.tar.gz
+46f73553336842dd67521da117bfc67e  cups-pdf_2.4.7.tar.gz