up to 21.72

diff --git a/hwinfo-headers.patch b/hwinfo-headers.patch
deleted file mode 100644 (file)
index 4c3d21d..0000000
--- a/hwinfo-headers.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- hwinfo-13.11/src/hd/Makefile.orig  2005-07-06 12:50:26.000000000 +0200
-+++ hwinfo-13.11/src/hd/Makefile       2007-05-23 22:01:21.136191593 +0200
-@@ -4,7 +4,7 @@
- 
- include $(TOPDIR)/Makefile.common
- 
--CFLAGS                += -I /usr/include/dbus-1.0 -I /usr/lib64/dbus-1.0/include -I /usr/lib/dbus-1.0/include
-+CFLAGS                += `pkg-config --cflags dbus-1`
- 
- version.h: $(TOPDIR)/VERSION
-       @echo "#define HD_VERSION_STRING \"`cat $(TOPDIR)/VERSION`\"" >$@

diff --git a/hwinfo-kbd.patch b/hwinfo-kbd.patch
index 40e114189319b4c82b03b9d99b7c0e675c0e0c95..cc58a50bd06f2c9d5e852d8166fa567d7ce65c08 100644 (file)
--- a/hwinfo-kbd.patch
+++ b/hwinfo-kbd.patch
@@ -12,5 +12,5 @@
      }
 +    */
  
-     if(tty_major == 229 /* iseries hvc */) {
-       if (tty_minor >= 128) {
+     if (0)
+           ;

diff --git a/hwinfo.spec b/hwinfo.spec
index 3c1b08c02e117f2333b841a974b22c878d2d7523..78fa434468e1d424f812afdad136ec185410f905 100644 (file)
--- a/hwinfo.spec
+++ b/hwinfo.spec
@@ -5,16 +5,14 @@
 Summary:       hwinfo - the hardware detection tool used in SuSE Linux
 Summary(pl.UTF-8):     hwinfo - narzędzie do wykrywania sprzętu używane w SuSE Linuksie
 Name:          hwinfo
-Version:       21.12
-Release:       2
+Version:       21.72
+Release:       1
 License:       GPL v2
 Group:         Applications/System
-Source0:       http://ftp.debian.org/debian/pool/main/h/hwinfo/%{name}_%{version}.orig.tar.gz
-# Source0-md5: 3a97acf3e32e43dfea13b90da1a8403a
+Source0:       https://ftp.debian.org/debian/pool/main/h/hwinfo/%{name}_%{version}.orig.tar.gz
+# Source0-md5: d33995be010185840f99c4eff4f699f0
 Patch0:                %{name}-kbd.patch
-Patch1:                %{name}-headers.patch
 URL:           http://packages.qa.debian.org/h/hwinfo.html
-BuildRequires: dbus-devel >= 0.35
 BuildRequires: flex
 %{?with_hal:BuildRequires:     hal-devel}
 %ifarch %{ix86} %{x8664} x32
@@ -45,7 +43,6 @@ Pliki nagłówkowe biblioteki hwinfo.
 %prep
 %setup -q
 %patch0 -p0
-%patch1 -p1
 
 # these should be in tarball, but aren't (21.6)
 test -e VERSION || echo %{version} > VERSION
@@ -74,7 +71,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc MAINTAINER README changelog
+%doc MAINTAINER README.md changelog
 %attr(755,root,root) %{_sbindir}/check_hd
 %attr(755,root,root) %{_sbindir}/convert_hd
 %attr(755,root,root) %{_sbindir}/getsysinfo