packages: isapnptools/isapnptools-ac_fix.patch, isapnptools/isapnptools.spe...

[qboosh]

Author: qboosh                       Date: Fri Jul  9 06:31:02 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 1.27
- updated ac_fix patch, dropped bogus getopt patch

---- Files affected:
packages/isapnptools:
   isapnptools-ac_fix.patch (1.1 -> 1.2) , isapnptools.spec (1.42 -> 1.43) , isapnptools-getopt.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/isapnptools/isapnptools-ac_fix.patch
diff -u packages/isapnptools/isapnptools-ac_fix.patch:1.1 packages/isapnptools/isapnptools-ac_fix.patch:1.2
--- packages/isapnptools/isapnptools-ac_fix.patch:1.1	Sun Jul 21 20:19:39 2002
+++ packages/isapnptools/isapnptools-ac_fix.patch	Fri Jul  9 08:30:57 2010
@@ -1,18 +1,32 @@
---- ./configure.in.org	Wed May  9 00:06:14 2001
-+++ ./configure.in	Sun Jul 21 20:10:47 2002
-@@ -34,13 +34,13 @@
+--- isapnptools-1.27/configure.in.orig	2007-03-24 18:10:59.000000000 +0100
++++ isapnptools-1.27/configure.in	2010-07-08 22:35:24.741393415 +0200
+@@ -36,7 +36,6 @@
  dnl Checks for library functions.
  AC_TYPE_SIGNAL
  AC_FUNC_VPRINTF
 -AC_SUBST(LIBOBJS) # Shouldn't be necessary ?
-+#AC_SUBST(LIBOBJS) # Shouldn't be necessary ?
- AC_CHECK_FUNCS(strncmp) # For getopt if required
- AC_CHECK_FUNCS(strdup strerror strtol strtoul nanosleep sched_setscheduler snprintf strncasecmp getdelim memcmp)
- AC_CHECK_FUNCS(iopl ioperm usleep delay _sleep2)
- 
+ #AC_FUNC_ALLOCA
+ #AC_FUNC_MALLOC
+ #AC_FUNC_MEMCMP
+@@ -47,7 +46,7 @@
+ AC_CHECK_FUNCS([alarm])
+ AC_CHECK_FUNCS([memset])
  dnl check for getopt in standard library
 -AC_CHECK_FUNCS(getopt_long , , [LIBOBJS="$LIBOBJS getopt.o getopt1.o"] ) 
-+AC_CHECK_FUNCS(getopt_long , , [AC_LIBOBJ([getopt.o, getopt1.o])] ) 
++AC_CHECK_FUNCS(getopt_long , , [AC_LIBOBJ([getopt]) AC_LIBOBJ([getopt1])]) 
  
  AC_ARG_ENABLE(
  	realtime,
+--- isapnptools-1.27/src/Makefile.am.orig	2001-05-15 22:37:05.000000000 +0200
++++ isapnptools-1.27/src/Makefile.am	2010-07-09 07:31:13.465393415 +0200
+@@ -37,8 +37,8 @@
+ 
+ sbin_PROGRAMS = pnpdump isapnp
+ isapnp_SOURCES = isapnp.c isapnp_main.l
+-isapnp_LDADD = @LIBOBJS@ libisapnp.a
++isapnp_LDADD = libisapnp.a
+ 
+ pnpdump_SOURCES = pnpdump.c pnpdump_main.c
+-pnpdump_LDADD = @LIBOBJS@ libisapnp.a
++pnpdump_LDADD = libisapnp.a
+ 

================================================================
Index: packages/isapnptools/isapnptools.spec
diff -u packages/isapnptools/isapnptools.spec:1.42 packages/isapnptools/isapnptools.spec:1.43
--- packages/isapnptools/isapnptools.spec:1.42	Tue Feb 13 09:06:35 2007
+++ packages/isapnptools/isapnptools.spec	Fri Jul  9 08:30:57 2010
@@ -6,18 +6,18 @@
 Summary(ru.UTF-8):	Программы для конфигурации ISA Plug-and-Play (PnP) устройств
 Summary(uk.UTF-8):	Програми для конфігурації ISA Plug-and-Play (PnP) пристроїв
 Name:		isapnptools
-Version:	1.26
-Release:	6
-License:	GPL
+Version:	1.27
+Release:	1
+License:	GPL v2
 Group:		Applications/System
-Source0:	ftp://ftp.demon.co.uk/pub/unix/linux/utils/%{name}-%{version}.tgz
-# Source0-md5:	26def2016548edeafe383113f0bc8ac6
+Source0:	ftp://metalab.unc.edu/pub/Linux/system/hardware/%{name}-%{version}.tgz
+# Source0-md5:	b997ba56583dc850fce9b93d658dfa0c
 Patch0:		%{name}-ac_fix.patch
-Patch1:		%{name}-getopt.patch
 URL:		http://www.roestock.demon.co.uk/isapnptools/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	flex
+BuildRequires:	libtool
 Requires(post):	fileutils
 Requires(post):	grep
 Requires(post):	sed
@@ -131,10 +131,9 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
-rm -f missing
+%{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__autoheader}
@@ -169,15 +168,18 @@
 %defattr(644,root,root,755)
 %doc ChangeLog NEWS README config-scripts/YMH0021
 %attr(750,root,root) %dir %{_sysconfdir}
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*
-%attr(755,root,root) %{_sbindir}/*
-%{_mandir}/man[58]/*
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/isapnp.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/isapnp.gone
+%attr(755,root,root) %{_sbindir}/isapnp
+%attr(755,root,root) %{_sbindir}/pnpdump
+%{_mandir}/man5/isapnp.conf.5*
+%{_mandir}/man8/isapnp.8*
+%{_mandir}/man8/pnpdump.8*
 
 %files devel
 %defattr(644,root,root,755)
-%{_libdir}/*.a
-%dir %{_includedir}/isapnp
-%{_includedir}/isapnp/*.h
+%{_libdir}/libisapnp.a
+%{_includedir}/isapnp
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -185,6 +187,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.43  2010/07/09 06:30:57  qboosh
+- updated to 1.27
+- updated ac_fix patch, dropped bogus getopt patch
+
 Revision 1.42  2007/02/13 08:06:35  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/isapnptools/isapnptools-ac_fix.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/isapnptools/isapnptools.spec?r1=1.42&r2=1.43&f=u