rpms/lshw/F-9 .cvsignore,1.3,1.4 lshw.spec,1.6,1.7 sources,1.3,1.4

[Terje Røsten (terjeros)]

Author: terjeros

Update of /cvs/extras/rpms/lshw/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8543/F-9

Modified Files:
	.cvsignore lshw.spec sources 
Log Message:
Sync with rawhide.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lshw/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Nov 2007 19:03:01 -0000	1.3
+++ .cvsignore	13 Aug 2008 20:01:53 -0000	1.4
@@ -1 +1 @@
-lshw-B.02.12.01.tar.gz
+lshw-B.02.13.tar.gz


Index: lshw.spec
===================================================================
RCS file: /cvs/extras/rpms/lshw/F-9/lshw.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- lshw.spec	15 Apr 2008 20:05:43 -0000	1.6
+++ lshw.spec	13 Aug 2008 20:01:53 -0000	1.7
@@ -1,7 +1,7 @@
 Summary:   Hardware lister
 Name:      lshw
-Version:   B.02.12.01
-Release:   5%{?dist}
+Version:   B.02.13
+Release:   2%{?dist}
 License:   GPLv2
 Group:     Applications/System
 URL:       http://ezix.org/project/wiki/HardwareLiSter
@@ -9,8 +9,7 @@
 Source1:   lshw.desktop
 Source2:   lshw.consolehelper
 Source3:   lshw.pam
-Patch0:    lshw-B.02.12.01-gcc43.patch
-Patch1:    lshw-B.02.12.01-config-cap.patch
+Patch0:    lshw-B.02.13-gcc43.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -37,8 +36,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch -p1
-%patch1 -p0
+%patch0 -p1
 
 %{__sed} -i 's|-g -Wall -g|%{optflags}|' src/Makefile
 %{__sed} -i 's|-g -Wall -Os|%{optflags}|' src/core/Makefile
@@ -110,6 +108,14 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Wed Aug 13 2008 Terje Rosten <terjeros at phys.ntnu.no> - B.02.13-2
+- proper patch macro
+
+* Wed Aug 13 2008 Terje Rosten <terjeros at phys.ntnu.no> - B.02.13-1
+- B.02.13
+- remove patches now upstream
+- add new gcc43 patch
+
 * Tue Apr 15 2008 Terje Rosten <terjeros at phys.ntnu.no> - B.02.12.01-5
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lshw/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Nov 2007 19:03:01 -0000	1.3
+++ sources	13 Aug 2008 20:01:53 -0000	1.4
@@ -1 +1 @@
-7aeacdd0b86ae03acbc168d8ecdf6fd6  lshw-B.02.12.01.tar.gz
+e94c728ed037ca706436b5ef71aa392d  lshw-B.02.13.tar.gz