rpms/hplip/F-12 .cvsignore, 1.34, 1.35 hplip.spec, 1.257, 1.258 sources, 1.34, 1.35

[Tim Waugh]

Author: twaugh

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-12/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- .cvsignore	26 Feb 2010 15:45:52 -0000	1.34
+++ .cvsignore	7 Apr 2010 14:22:18 -0000	1.35
@@ -31,3 +31,4 @@ hplip-3.9.2.tar.gz
 hplip-3.9.6b.tar.gz
 hplip-3.9.8.tar.gz
 hplip-3.10.2.tar.gz
+hpcups-update-ppds.sh


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-12/hplip.spec,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -p -r1.257 -r1.258
--- hplip.spec	23 Mar 2010 16:55:08 -0000	1.257
+++ hplip.spec	7 Apr 2010 14:22:19 -0000	1.258
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.10.2
-Release: 2%{?dist}
+Release: 3%{?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
@@ -202,6 +203,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
 
@@ -337,6 +341,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/*
@@ -365,7 +370,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-3
+- Regenerate hpcups PPDs on upgrade if necessary (bug #579355).
+
 * Tue Mar 23 2010 Tim Waugh <twaugh at redhat.com> - 3.10.2-2
 - Explicitly destroy tray icon on exit (bug #543286).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-12/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- sources	26 Feb 2010 15:45:55 -0000	1.34
+++ sources	7 Apr 2010 14:22:19 -0000	1.35
@@ -1 +1,2 @@
 4df6f16c47ae7edd015bf2cf5155f26f  hplip-3.10.2.tar.gz
+110820c749dc7ec81e949c193187cb39  hpcups-update-ppds.sh