rpms/hplip/F-13 .cvsignore, 1.36, 1.37 hplip.spec, 1.266, 1.267 sources, 1.36, 1.37

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv25613

Modified Files:
	.cvsignore hplip.spec sources 
Log Message:
* Wed Apr  7 2010 Tim Waugh <twaugh at redhat.com> - 3.10.2-7
- Regenerate hpcups PPDs on upgrade if necessary (bug #579355).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-13/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- .cvsignore	26 Feb 2010 12:41:25 -0000	1.36
+++ .cvsignore	7 Apr 2010 14:33:46 -0000	1.37
@@ -33,3 +33,4 @@ hplip-3.9.8.tar.gz
 hplip-3.9.10.tar.gz
 hplip-3.9.12.tar.gz
 hplip-3.10.2.tar.gz
+hpcups-update-ppds.sh


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-13/hplip.spec,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -p -r1.266 -r1.267
--- hplip.spec	26 Mar 2010 15:36:41 -0000	1.266
+++ hplip.spec	7 Apr 2010 14:33:46 -0000	1.267
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.10.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -13,6 +13,7 @@ Conflicts: selinux-policy < 3.0.3-3
 
 Url: http://hplip.sourceforge.net/
 Source0: http://kent.dl.sourceforge.net/sourceforge/hplip/%{name}-%{version}.tar.gz
+Source1: hpcups-update-ppds.sh
 Patch1: hplip-pstotiff-is-rubbish.patch
 Patch2: hplip-strstr-const.patch
 Patch3: hplip-ui-optional.patch
@@ -216,6 +217,9 @@ desktop-file-install --vendor HP        
         --add-category Application                              \
         hplip.desktop
 
+# Regenerate hpcups PPDs on upgrade if necessary (bug #579355).
+install -p -m755 %{SOURCE1} %{buildroot}%{_bindir}/hpcups-update-ppds
+
 %{__mkdir_p} %{buildroot}%{_sysconfdir}/sane.d/dll.d
 echo hpaio > %{buildroot}%{_sysconfdir}/sane.d/dll.d/hpaio
 
@@ -352,6 +356,7 @@ rm -rf %{buildroot}
 %files -n hpijs
 %defattr(-,root,root)
 %{_bindir}/hpijs
+%{_bindir}/hpcups-update-ppds
 %dir %{_datadir}/ppd/HP
 %{_datadir}/ppd/HP/*.ppd.gz
 %{_datadir}/cups/drv/*
@@ -380,7 +385,13 @@ fi
 %postun gui
 /usr/bin/update-desktop-database &>/dev/null ||:
 
+%post -n hpijs
+%{_bindir}/hpcups-update-ppds &>/dev/null ||:
+
 %changelog
+* Wed Apr  7 2010 Tim Waugh <twaugh at redhat.com> - 3.10.2-7
+- Regenerate hpcups PPDs on upgrade if necessary (bug #579355).
+
 * Fri Mar 26 2010 Jiri Popelka <jpopelka at redhat.com> - 3.10.2-6
 - Add Device ID for HP LaserJet 2300 (#576928)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-13/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- sources	26 Feb 2010 12:41:25 -0000	1.36
+++ sources	7 Apr 2010 14:33:46 -0000	1.37
@@ -1,2 +1,2 @@
-2b0906b4a57b437988829557ca62adfd  hplip-3.9.12.tar.gz
 4df6f16c47ae7edd015bf2cf5155f26f  hplip-3.10.2.tar.gz
+110820c749dc7ec81e949c193187cb39  hpcups-update-ppds.sh