Here are some mor fixes for make install impaired packages. Enjoy &
merge with cooker!!!
Stefan
PS: src.rpm's are being uploaded to /incoming
--- menu.spec.orig Mon Jul 10 22:22:01 2000
+++ menu.spec Mon Jul 10 22:24:45 2000
@@ -1,7 +1,7 @@
%define name menu
%define version 2.1.5
%define subversion 4
-%define release 19mdk
+%define release 20mdk
Summary: menu system
Name: %{name}
@@ -61,7 +61,7 @@
install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/usr/lib/menu/menu
mkdir -p $RPM_BUILD_ROOT/usr/share/icons/mini
tar yxf %{SOURCE2} -C $RPM_BUILD_ROOT/usr/share/icons
-make prefix=$RPM_BUILD_ROOT/usr install
+%makeinstall
mv $RPM_BUILD_ROOT/usr/bin/install-menu $RPM_BUILD_ROOT/usr/sbin
mv $RPM_BUILD_ROOT/usr/bin/install-fvwmgenmenu $RPM_BUILD_ROOT/usr/sbin
#cp `find default/* -prune -type f` $RPM_BUILD_ROOT/usr/lib/menu/default
@@ -99,13 +99,17 @@
%doc doc/{README*,BUGS,menu.txt} AUTHORS debian/changelog
%config /etc/*/*
%dir /etc/menu
-/usr/bin
-/usr/sbin
-/usr/man
-/usr/share
-/usr/lib
+%{_bindir}
+%{_sbindir}
+%{_mandir}
+%{_datadir}
+%{_libdir}
%changelog
+* Mon Jul 10 2000 Stefan van der Eijk <[EMAIL PROTECTED]> 2.1.5-20mdk
+- makeinstall macro
+- macroszifications
+
* Wed May 10 2000 Frederic Lepied <[EMAIL PROTECTED]> 2.1.5-19mdk
- po updates for fr, lt, ro and sk.
--- patch.spec.orig Mon Jul 10 22:05:58 2000
+++ patch.spec Mon Jul 10 22:07:06 2000
@@ -1,5 +1,5 @@
%define ver 2.5.4
-%define rel 4mdk
+%define rel 5mdk
Summary: The GNU patch command, for modifying/upgrading files.
Name: patch
@@ -39,7 +39,7 @@
%install
rm -rf $RPM_BUILD_ROOT
-make install prefix=$RPM_BUILD_ROOT/usr
+%makeinstall
strip $RPM_BUILD_ROOT/usr/bin/*
@@ -56,10 +56,14 @@
%files
%defattr(-,root,root)
%doc NEWS README AUTHORS ChangeLog
-/usr/bin/*
-/usr/man/*/*
+%{_bindir}/*
+%{_mandir}/*/*
%changelog
+* Mon Jul 10 2000 Stefan van der Eijk <[EMAIL PROTECTED]> 2.5.4-5mdk
+- makeinstall macro
+- macroszifications
+
* Sun Apr 02 2000 Adam Lebsack <[EMAIL PROTECTED]> 2.5.4-4mdk
- Fixed powerpc by adding -D_GNU_SOURCE flag.
--- pidentd.spec.orig Mon Jul 10 22:03:40 2000
+++ pidentd.spec Mon Jul 10 22:04:49 2000
@@ -1,6 +1,6 @@
%define name pidentd
%define version 3.0.11
-%define release 1mdk
+%define release 2mdk
Summary: An implementation of the RFC1413 identification server.
Name: %{name}
@@ -44,10 +44,10 @@
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/usr/{sbin,man/man8}
-make prefix=${RPM_BUILD_ROOT}%{_prefix} install
+%makeinstall
-ln -s identd ${RPM_BUILD_ROOT}%{_prefix}/sbin/in.identd
-ln -s identd.8 ${RPM_BUILD_ROOT}%{_prefix}/sbin/in.identd.8
+ln -s identd ${RPM_BUILD_ROOT}%{_sbindir}/in.identd
+ln -s identd.8 ${RPM_BUILD_ROOT}%{_sbindir}/in.identd.8
mkdir -p ${RPM_BUILD_ROOT}/etc/rc.d/{init,rc0,rc1,rc2,rc3,rc4,rc5,rc6}.d
install -m 0644 etc/identd.conf $RPM_BUILD_ROOT/etc/identd.conf
install -m 0644 etc/identd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/identd
@@ -57,7 +57,7 @@
%post
/sbin/chkconfig --add identd
-/usr/bin/perl -i -pe 's/^(\s*auth\s.*)/#$1/' /etc/inetd.conf
+%{_bindir}/perl -i -pe 's/^(\s*auth\s.*)/#$1/' /etc/inetd.conf
%preun
if [ "$1" = 0 ]; then
@@ -67,12 +67,16 @@
%files
%defattr(-,root,root)
%doc BUGS ChangeLog FAQ INSTALL README Y2K doc/rfc1413.txt doc/sgi_irix.txt
-%{_prefix}/sbin/*
+%{_sbindir}/*
%attr(0644,root,root) %config /etc/identd.conf
%attr(0755,root,root) %config /etc/rc.d/init.d/identd
-%{_prefix}/man/man8/*
+%{_mandir}/man8/*
%changelog
+* Mon Jul 10 2000 Stefan van der Eijk <[EMAIL PROTECTED]> 3.0.11-2mdk
+- makeinstall macro
+- macroszifications
+
* Mon Jun 12 2000 Stefan van der Eijk <[EMAIL PROTECTED]> 3.0.11-1mdk
- updated to 3.0.11
- removed 3.0.10 security patch (fixed in 3.0.11)
--- pth.spec.orig Mon Jul 10 21:40:07 2000
+++ pth.spec Mon Jul 10 21:40:56 2000
@@ -1,6 +1,6 @@
%define name pth
%define version 1.3.1
-%define release 3mdk
+%define release 4mdk
%define serial 1
Summary: GNU Pth - GNU Portable Threads.
@@ -47,7 +47,7 @@
%install
if [ -d $RPM_BUILD_ROOT ]; then rm -rf $RPM_BUILD_ROOT; fi
mkdir -p $RPM_BUILD_ROOT
-make prefix=$RPM_BUILD_ROOT/usr install
+%makeinstall
%post -p /sbin/ldconfig
@@ -58,19 +58,22 @@
%files
%defattr(-,root,root,755)
-/usr/lib/libpth.so.*
+%{_libdir}/libpth.so.*
%files devel
%defattr(-,root,root,755)
%doc AUTHORS COPYING ChangeLog INSTALL NEWS PORTING README THANKS
-/usr/bin/pth-config
-/usr/include/pth.h
-/usr/lib/libpth.a
-/usr/lib/libpth.la
-/usr/lib/libpth.so
-/usr/man/*/*
+%{_bindir}/pth-config
+%{_includedir}/pth.h
+%{_libdir}/libpth.a
+%{_libdir}/libpth.la
+%{_libdir}/libpth.so
+%{_mandir}/*/*
%changelog
+* Mon Jul 10 2000 Stefan van der Eijk <[EMAIL PROTECTED]> 1.3.1-4mdk
+- makeinstall macro
+- macroszifications
* Thu Apr 13 2000 Francis Galiegue <[EMAIL PROTECTED]> 1.3.1-3mdk
--- rsync.spec.orig Mon Jul 10 21:34:59 2000
+++ rsync.spec Mon Jul 10 21:35:51 2000
@@ -1,5 +1,5 @@
%define version 2.4.3
-%define release 1mdk
+%define release 2mdk
Summary: A program for synchronizing files over a network.
Name: rsync
@@ -37,10 +37,10 @@
%install
rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/%{_prefix}/bin
-mkdir -p $RPM_BUILD_ROOT/%{_prefix}/man/man1.bz2
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1.bz2
-make prefix=$RPM_BUILD_ROOT/%{_prefix} install
+%makeinstall
install -m644 %{SOURCE1} %{SOURCE2} .
@@ -49,15 +49,19 @@
%files
%defattr(-,root,root)
-%{_prefix}/bin/rsync
-%{_prefix}/man/man1/rsync.1*
-%{_prefix}/man/man5/rsyncd.conf.5*
+%{_bindir}/rsync
+%{_mandir}/man1/rsync.1*
+%{_mandir}/man5/rsyncd.conf.5*
%doc tech_report.tex
%doc README
%doc COPYING
%doc *html
%changelog
+* Mon Jul 10 2000 Stefan van der Eijk <[EMAIL PROTECTED]> 2.4.3-2mdk
+- makeinstall macro
+- macroszifications
+
* Fri May 26 2000 Frederic Lepied <[EMAIL PROTECTED]> 2.4.3-1mdk
- 2.4.3
--- swi-prolog.spec.orig Mon Jul 10 20:40:37 2000
+++ swi-prolog.spec Mon Jul 10 21:04:45 2000
@@ -2,7 +2,7 @@
Name: swi-prolog
Obsoletes: swi-pl
Version: 3.3.6
-Release: 1mdk
+Release: 2mdk
Copyright: GPL
Group: Development/Other
URL: http://www.swi.psy.uva.nl/usr/jan/SWI-Prolog.html
@@ -28,22 +28,27 @@
%install
install -d $RPM_BUILD_ROOT/usr/{bin,include,lib,man/man1}
-make -C src install prefix=$RPM_BUILD_ROOT/usr
+%makeinstall
+mv $RPM_BUILD_ROOT/usr/man/*.1* $RPM_BUILD_ROOT/usr/man/man1
-rm -rf $RPM_BUILD_ROOT/usr/lib/*/man
+rm -rf $RPM_BUILD_ROOT%{_libdir}/*/man
%clean
rm -rf $RPM_BUILD_ROOT $RPM_BUILD_DIR/pl-%{PACKAGE_VERSION}
%files
%defattr(-,root,root,0755)
-%doc LSM PORTING README README.linux STAMP VERSION
-/usr/bin/*
-/usr/lib/pl-*
-/usr/include/*
-/usr/man/*/pl*
+%doc LSM PORTING README VERSION
+%{_bindir}/*
+%{_libdir}/pl-*
+%{_includedir}/*
+%{_mandir}/*/pl*
%changelog
+* Mon Jul 10 2000 Stefan van der Eijk <[EMAIL PROTECTED]> 3.3.6-2mdk
+- makeinstall macro
+- macroszifications
+
* Wed Jun 7 2000 Pixel <[EMAIL PROTECTED]> 3.3.6-1mdk
- change name to swi-prolog
- new version
--- urlview.spec.orig Mon Jul 10 20:32:54 2000
+++ urlview.spec Mon Jul 10 20:39:28 2000
@@ -1,5 +1,5 @@
%define name urlview
-%define release 2mdk
+%define release 3mdk
%define version 0.8.1
Name: %{name}
@@ -31,8 +31,8 @@
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/usr/{bin,man/man1}
-make prefix=$RPM_BUILD_ROOT/usr install
-install -m755 url_handler.sh $RPM_BUILD_ROOT/usr/bin/url_handler.sh
+%makeinstall
+install -m755 url_handler.sh $RPM_BUILD_ROOT%{_bindir}/url_handler.sh
%clean
rm -rf $RPM_BUILD_ROOT
@@ -42,11 +42,15 @@
%doc AUTHORS ChangeLog COPYING
%doc INSTALL README sample.urlview
%doc urlview.sgml
-/usr/bin/urlview
-/usr/bin/url_handler.sh
-/usr/man/man1/urlview.1*
+%{_bindir}/urlview
+%{_bindir}/url_handler.sh
+%{_mandir}/man1/urlview.1*
%changelog
+* Mon Jul 10 2000 Stefan van der Eijk <[EMAIL PROTECTED]> 0.8.1-3mdk
+- makeinstall macro
+- macroszifications
+
* Wed May 24 2000 Chmouel Boudjnah <[EMAIL PROTECTED]> 0.8.1-2mdk
- On alpha get a regex.o compiled and linked for alpha.
