- updated to 2.5

Changed files:
    dmidecode-mandir.patch -> 1.2
    dmidecode.spec -> 1.11

diff --git a/dmidecode-mandir.patch b/dmidecode-mandir.patch
index e6467304e181e74459e78a428bb7d18779d152c0..c165825ffc9e7e565dd26877255b682ed6d05e46 100644 (file)
--- a/dmidecode-mandir.patch
+++ b/dmidecode-mandir.patch
@@ -1,17 +1,12 @@
---- Makefile~  2004-02-23 19:56:04.000000000 +0100
-+++ Makefile   2004-03-25 18:49:15.000000000 +0100
-@@ -71,10 +71,10 @@
-       install -m 755 biosdecode $(PREFIX)/sbin
-       install -m 755 ownership $(PREFIX)/sbin
-       install -m 755 vpddecode $(PREFIX)/sbin
--      install -m 644 man/dmidecode.8 $(PREFIX)/man/man8
--      install -m 644 man/biosdecode.8 $(PREFIX)/man/man8
--      install -m 644 man/ownership.8 $(PREFIX)/man/man8
--      install -m 644 man/vpddecode.8 $(PREFIX)/man/man8
-+      install -m 644 man/dmidecode.8 $(PREFIX)/share/man/man8
-+      install -m 644 man/biosdecode.8 $(PREFIX)/share/man/man8
-+      install -m 644 man/ownership.8 $(PREFIX)/share/man/man8
-+      install -m 644 man/vpddecode.8 $(PREFIX)/share/man/man8
+diff -urN dmidecode-2.5.orig/Makefile dmidecode-2.5/Makefile
+--- dmidecode-2.5.orig/Makefile        2004-11-11 22:23:34.453338320 +0100
++++ dmidecode-2.5/Makefile     2004-11-11 22:40:56.207967544 +0100
+@@ -25,7 +25,7 @@
+ DESTDIR =
+ prefix  = /usr/local
+ sbindir = $(prefix)/sbin
+-mandir  = $(prefix)/man
++mandir  = $(prefix)/share/man
+ man8dir = $(mandir)/man8
  
- uninstall :
-       rm -f $(PREFIX)/sbin/dmidecode $(PREFIX)/man/man8/dmidecode.8
+ all : dmidecode biosdecode ownership vpddecode

diff --git a/dmidecode.spec b/dmidecode.spec
index 96aa18e0a73533a241c4bca9cdb556f18fc2a983..7f7f02a0698ccec5beaa73d30eda20ecafaa5cb9 100644 (file)
--- a/dmidecode.spec
+++ b/dmidecode.spec
@@ -1,12 +1,12 @@
 Summary:       A tool for dumping a computer's DMI table contents
 Summary(pl):   Narzêdzie do zrzucania zawarto¶ci tabeli DMI komputera
 Name:          dmidecode
-Version:       2.4
+Version:       2.5
 Release:       1
 License:       GPL
 Group:         Applications/System
 Source0:       http://savannah.nongnu.org/download/%{name}/%{name}-%{version}.tar.bz2
-# Source0-md5: dab0937d69ee5b90ccaefa3c28071718
+# Source0-md5: df1900d748cc227fcac31552ce558574
 Patch0:                %{name}-mandir.patch
 URL:           http://www.nongnu.org/dmidecode
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -25,7 +25,7 @@ u
 
 %prep
 %setup -q
-%patch0
+%patch0 -p1
 
 %build
 %{__make} \
@@ -37,7 +37,8 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man8}
 
 %{__make} install \
-       PREFIX=$RPM_BUILD_ROOT%{_prefix}
+       prefix=%{_prefix} \
+       DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT