rpms/hplip/devel .cvsignore, 1.4, 1.5 hplip.spec, 1.23, 1.24 sources, 1.4, 1.5 hplip-0.9.5-2.patch, 1.1, NONE hplip-compile.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: twaugh

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

Modified Files:
	.cvsignore hplip.spec sources 
Removed Files:
	hplip-0.9.5-2.patch hplip-compile.patch 
Log Message:
* Wed Oct 12 2005 Tim Waugh <twaugh at redhat.com> 0.9.6-2
- 0.9.6.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	19 Sep 2005 10:43:57 -0000	1.4
+++ .cvsignore	13 Oct 2005 08:05:16 -0000	1.5
@@ -1,3 +1,4 @@
 hplip-0.9.3.tar.gz
 hplip-0.9.4.tar.gz
 hplip-0.9.5.tar.gz
+hplip-0.9.6.tar.gz


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- hplip.spec	20 Sep 2005 10:05:30 -0000	1.23
+++ hplip.spec	13 Oct 2005 08:05:16 -0000	1.24
@@ -1,17 +1,15 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
-Version: 0.9.5
-Release: 3
+Version: 0.9.6
+Release: 2
 License: GPL/MIT/BSD
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
 
 Url: http://sourceforge.net/projects/hpinkjet
 Source: http://kent.dl.sourceforge.net/sourceforge/hpinkjet/%{name}-%{version}.tar.gz
-Patch1: hplip-compile.patch
 Patch2: hplip-desktop.patch
 Patch3: hplip-config.patch
-Patch4: http://kent.dl.sourceforge.net/sourceforge/hpinkjet/hplip-0.9.5-2.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
 Requires: desktop-file-utils >= 0.2.92
@@ -53,24 +51,19 @@
 rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 %setup -q
 
-# Fix compile errors.
-%patch1 -p1 -b .compile
-
 # Use /usr/share/applications for putting desktop files in.
 %patch2 -p1 -b .desktop
 
 # Use static IP ports (for SELinux policy).
 %patch3 -p1 -b .config
 
-# Apply upstream patch to fix scanning in LaserJets and parallel InkJets.
-%patch4 -p1 -b .config
-
 %build
 %configure
 make
 
 %install
 rm -rf %{buildroot}
+mkdir -p %{buildroot}%{_bindir}
 make install DESTDIR=%{buildroot}
 
 # Move SANE backend into correct directory
@@ -145,6 +138,9 @@
 fi
 
 %changelog
+* Wed Oct 12 2005 Tim Waugh <twaugh at redhat.com> 0.9.6-2
+- 0.9.6.
+
 * Tue Sep 20 2005 Tim Waugh <twaugh at redhat.com> 0.9.5-3
 - Apply upstream patch to fix scanning in LaserJets and parallel InkJets.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	19 Sep 2005 10:43:57 -0000	1.4
+++ sources	13 Oct 2005 08:05:16 -0000	1.5
@@ -1 +1 @@
-cb71d665ff935129029c78148b2b0c23  hplip-0.9.5.tar.gz
+a95d8087198e16dde758332b612fb112  hplip-0.9.6.tar.gz


--- hplip-0.9.5-2.patch DELETED ---


--- hplip-compile.patch DELETED ---