rpms/hplip/devel hplip.spec,1.9,1.10

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/hplip/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6814

Modified Files:
	hplip.spec 
Log Message:
* Tue Jun 14 2005 Tim Waugh <twaugh at redhat.com>
- Conflicts: hpijs from before this package provided it.


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- hplip.spec	13 Jun 2005 17:06:29 -0000	1.9
+++ hplip.spec	14 Jun 2005 15:34:14 -0000	1.10
@@ -20,6 +20,9 @@
 Requires: desktop-file-utils >= 0.2.92
 Requires: PyQt
 
+%define hpijs_epoch 1
+Conflicts: hpijs < %{hpijs_epoch}:%{version}-%{release}
+
 BuildRequires: net-snmp-devel
 BuildRequires: cups-devel
 
@@ -31,7 +34,7 @@
 Summary: HP Printer Drivers
 Group: Applications/Publishing
 License: BSD
-Epoch: 1
+Epoch: %{hpijs_epoch}
 
 %description -n hpijs
 hpijs is a collection of optimized drivers for HP printers.
@@ -139,7 +142,8 @@
 fi
 
 %changelog
-* Mon Jun 13 2005 Tim Waugh <twaugh at redhat.com>
+* Tue Jun 14 2005 Tim Waugh <twaugh at redhat.com>
+- Conflicts: hpijs from before this package provided it.
 - Conflicts: system-config-printer < 0.6.132 (i.e. before HPLIP support
   was added)