rpms/hplip/F-11 .cvsignore, 1.34, 1.35 hplip.spec, 1.246, 1.247 sources, 1.34, 1.35
Tim Waugh
twaugh at fedoraproject.org
Wed Apr 7 14:33:03 UTC 2010
- Previous message: rpms/ppp/F-13 ppp-2.4.5-manpg.patch,NONE,1.1 ppp.spec,1.58,1.59
- Next message: rpms/babel/F-12 .cvsignore, 1.7, 1.8 babel.spec, 1.15, 1.16 sources, 1.7, 1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: twaugh
Update of /cvs/pkgs/rpms/hplip/F-11
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv25299
Modified Files:
.cvsignore hplip.spec sources
Log Message:
* Wed Apr 7 2010 Tim Waugh <twaugh at redhat.com> - 3.10.2-2
- Regenerate hpcups PPDs on upgrade if necessary (bug #579355).
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-11/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- .cvsignore 23 Mar 2010 17:40:32 -0000 1.34
+++ .cvsignore 7 Apr 2010 14:33:02 -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-11/hplip.spec,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -p -r1.246 -r1.247
--- hplip.spec 23 Mar 2010 17:40:34 -0000 1.246
+++ hplip.spec 7 Apr 2010 14:33:02 -0000 1.247
@@ -1,7 +1,7 @@
Summary: HP Linux Imaging and Printing Project
Name: hplip
Version: 3.10.2
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+ and MIT
Group: System Environment/Daemons
Conflicts: system-config-printer < 0.6.132
@@ -14,6 +14,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: hplip.fdi
+Source2: hpcups-update-ppds.sh
Patch1: hplip-pstotiff-is-rubbish.patch
Patch2: hplip-strstr-const.patch
Patch3: hplip-ui-optional.patch
@@ -206,6 +207,9 @@ desktop-file-install --vendor HP \
mkdir -p %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor
install -p -m644 %{SOURCE1} %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor/10-hplip.fdi
+# Regenerate hpcups PPDs on upgrade if necessary (bug #579355).
+install -p -m755 %{SOURCE2} %{buildroot}%{_bindir}/hpcups-update-ppds
+
%{__mkdir_p} %{buildroot}%{_sysconfdir}/sane.d/dll.d
echo hpaio > %{buildroot}%{_sysconfdir}/sane.d/dll.d/hpaio
@@ -344,6 +348,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 @@ if [ -f /etc/sane.d/dll.conf ] && \
fi
exit 0
+%post -n hpijs
+%{_bindir}/hpcups-update-ppds &>/dev/null ||:
+
%changelog
+* Wed Apr 7 2010 Tim Waugh <twaugh at redhat.com> - 3.10.2-2
+- Regenerate hpcups PPDs on upgrade if necessary (bug #579355).
+
* Tue Mar 23 2010 Tim Waugh <twaugh at redhat.com> - 3.10.2-1
- 3.10.2 backported from Fedora 12 (bug #576080).
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-11/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- sources 23 Mar 2010 17:40:34 -0000 1.34
+++ sources 7 Apr 2010 14:33:02 -0000 1.35
@@ -1 +1,2 @@
4df6f16c47ae7edd015bf2cf5155f26f hplip-3.10.2.tar.gz
+110820c749dc7ec81e949c193187cb39 hpcups-update-ppds.sh
- Previous message: rpms/ppp/F-13 ppp-2.4.5-manpg.patch,NONE,1.1 ppp.spec,1.58,1.59
- Next message: rpms/babel/F-12 .cvsignore, 1.7, 1.8 babel.spec, 1.15, 1.16 sources, 1.7, 1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list