rpms/hplip/FC-4 hplip.spec,1.20,1.21 sources,1.3,1.4

[fedora-cvs-commits at redhat.com]

Author: twaugh

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

Modified Files:
	hplip.spec sources 
Log Message:
* Mon Sep 19 2005 Tim Waugh <twaugh at redhat.com> 0.9.5-1
- Build for Fedora Core 4.
- 0.9.5.
- No longer need condrestart patch.



Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/FC-4/hplip.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- hplip.spec	26 Jul 2005 14:01:32 -0000	1.20
+++ hplip.spec	19 Sep 2005 10:50:31 -0000	1.21
@@ -1,16 +1,15 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
-Version: 0.9.4
-Release: 1.1
+Version: 0.9.5
+Release: 1
 License: GPL/MIT/BSD
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.131.3
 
 Url: http://sourceforge.net/projects/hpinkjet
 Source: http://kent.dl.sourceforge.net/sourceforge/hpinkjet/%{name}-%{version}.tar.gz
-Patch1: hplip-condrestart.patch
-Patch2: hplip-desktop.patch
-Patch3: hplip-config.patch
+Patch1: hplip-desktop.patch
+Patch2: hplip-config.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
 Requires: desktop-file-utils >= 0.2.92
@@ -52,14 +51,11 @@
 rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 %setup -q
 
-# Fix condrestart in the initscript.
-%patch1 -p1 -b .condrestart
-
 # Use /usr/share/applications for putting desktop files in.
-%patch2 -p1 -b .desktop
+%patch1 -p1 -b .desktop
 
 # Use static IP ports (for SELinux policy).
-%patch3 -p1 -b .config
+%patch2 -p1 -b .config
 
 %build
 %configure
@@ -141,6 +137,11 @@
 fi
 
 %changelog
+* Mon Sep 19 2005 Tim Waugh <twaugh at redhat.com> 0.9.5-1
+- Build for Fedora Core 4.
+- 0.9.5.
+- No longer need condrestart patch.
+
 * Tue Jul 26 2005 Tim Waugh <twaugh at redhat.com>
 - Fix condrestart in the initscript.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/hplip/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Jul 2005 12:10:42 -0000	1.3
+++ sources	19 Sep 2005 10:50:31 -0000	1.4
@@ -1 +1 @@
-2ebb0708d7ac18f923540bf75250cd30  hplip-0.9.4.tar.gz
+cb71d665ff935129029c78148b2b0c23  hplip-0.9.5.tar.gz