Here are the .diffs for aboot, aktion and am-utils BM fixed src.rpms.
Also (as a reminder) the .diff for the fixed ypserv package (I screwed
up on the previous one).
I'll upload the src.rpm's to /incoming.
Have a nice weekend!!
Stefan
--- aboot.spec.orig Sat Jul 29 18:04:19 2000
+++ aboot.spec Sat Jul 29 19:19:21 2000
@@ -2,7 +2,7 @@
Name: aboot
%define aboot_version 0.7a
Version: %{aboot_version}
-Release: 1mdk
+Release: 2mdk
ExclusiveArch: alpha
Copyright: distributable
Group: System Environment/Base
@@ -38,24 +38,27 @@
mkdir -p $RPM_BUILD_ROOT
chmod go= $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/usr/man/man8
-make root=$RPM_BUILD_ROOT install
-cp -p sdisklabel/swriteboot.8 tools/e2writeboot.8 $RPM_BUILD_ROOT/usr/man/man8
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8
+%makeinstall root=$RPM_BUILD_ROOT bindir=$RPM_BUILD_ROOT/sbin
+cp -p sdisklabel/swriteboot.8 tools/e2writeboot.8 $RPM_BUILD_ROOT%{_mandir}/man8
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-, root, root)
-%doc INSTALL README doc/*
+%doc INSTALL README
%attr(644, root, root) /boot/bootlx
/sbin/abootconf
/sbin/e2writeboot
/sbin/isomarkboot
/sbin/swriteboot
-/usr/man/man*/*
+%{_mandir}/man*/*
%changelog
+* Sat Jul 29 2000 Stefan van der Eijk <[EMAIL PROTECTED]> 0.7a-2mdk
+- BM
+
* Tue Jun 27 2000 Chmouel Boudjnah <[EMAIL PROTECTED]> 0.7a-1mdk
- 0.7a.
- Fix url.
--- aktion.spec.orig Sat Jul 29 18:23:29 2000
+++ aktion.spec Sat Jul 29 18:29:34 2000
@@ -1,7 +1,7 @@
%define prefix /usr
%define name aktion
%define version 0.4.1
-%define release 4mdk
+%define release 5mdk
Summary: A Movie player for KDE
Name: %{name}
@@ -11,7 +11,7 @@
Source1: aktion_menu
Copyright: GPL
Group: Video
-BuildRoot: /var/tmp/%{name}-buildroot
+BuildRoot: %{_tmppath}/%{name}-buildroot
Requires: kdebase >= 1.1.1.99_19990715 qt >= 1.44 xanim >= 28010
%description
@@ -42,25 +42,25 @@
%install
rm -rf $RPM_BUILD_ROOT
-make install
+%makeinstall
-mkdir -p $RPM_BUILD_ROOT/usr/lib/menu
-install -m644 %{SOURCE1} $RPM_BUILD_ROOT/usr/lib/menu/aktion
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/menu
+install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/menu/aktion
%clean
rm -rf $RPM_BUILD_ROOT
%post
-[ -x /usr/bin/update-menus ] && /usr/bin/update-menus || true
+[ -x %{_bindir}/update-menus ] && %{_bindir}/update-menus || true
%postun
if [ "$1" = 0 ]; then
- [ -x /usr/bin/update-menus ] && /usr/bin/update-menus || true
+ [ -x %{_bindir}/update-menus ] && %{_bindir}/update-menus || true
fi
%files
%defattr(-,root,root,0755)
-%{prefix}/lib/menu/aktion
+%{_libdir}/menu/aktion
%{prefix}/doc/kde/HTML/en/aktion/aktion.jpg
%{prefix}/doc/kde/HTML/en/aktion/aktion.html
%{prefix}/doc/kde/HTML/en/aktion/kxanim-h.html
@@ -79,37 +79,40 @@
%{prefix}/doc/kde/HTML/es/aktion/titulo_kxanim.jpg
%{prefix}/doc/kde/HTML/es/aktion/screen.jpg
%{prefix}/doc/kde/HTML/es/aktion/fullscreen_es.html
-# %{prefix}/share/applnk/Multimedia/aktion.kdelnk
-%{prefix}/share/icons/aktion.xpm
-%{prefix}/share/icons/mini/aktion.xpm
-%{prefix}/share/config/aktionrc
-%{prefix}/share/apps/aktion/toolbar/ayuda.xpm
-%{prefix}/share/apps/aktion/toolbar/tocar.xpm
-%{prefix}/share/apps/aktion/toolbar/pause.xpm
-%{prefix}/share/apps/aktion/toolbar/parar.xpm
-%{prefix}/share/apps/aktion/toolbar/fileopen.xpm
-%{prefix}/share/apps/aktion/toolbar/avanzar.xpm
-%{prefix}/share/apps/aktion/toolbar/retroceder.xpm
-%{prefix}/share/apps/aktion/toolbar/aktion.xpm
-%{prefix}/share/apps/aktion/toolbar/ak_setup.xpm
-%{prefix}/share/apps/aktion/toolbar/half.xpm
-%{prefix}/share/apps/aktion/toolbar/double.xpm
-%{prefix}/share/apps/aktion/toolbar/original.xpm
-%{prefix}/share/apps/aktion/toolbar/ak_maximize.xpm
-%{prefix}/share/apps/aktion/toolbar/fullscreen.xpm
-%{prefix}/share/mimelnk/video/x-aktion-mpeg.kdelnk
-%{prefix}/share/mimelnk/video/x-aktion-msvideo.kdelnk
-%{prefix}/share/mimelnk/video/x-aktion-quicktime.kdelnk
-%{prefix}/share/mimelnk/video/x-aktion-flic.kdelnk
-%{prefix}/share/locale/es/LC_MESSAGES/aktion.mo
-%{prefix}/share/locale/de/LC_MESSAGES/aktion.mo
-%{prefix}/share/locale/hu/LC_MESSAGES/aktion.mo
-%{prefix}/share/locale/fr/LC_MESSAGES/aktion.mo
-%{prefix}/share/locale/sk/LC_MESSAGES/aktion.mo
-%{prefix}/share/locale/it/LC_MESSAGES/aktion.mo
-%{prefix}/bin/aktion
+# %{_datadir}/applnk/Multimedia/aktion.kdelnk
+%{_datadir}/icons/aktion.xpm
+%{_datadir}/icons/mini/aktion.xpm
+%{_datadir}/config/aktionrc
+%{_datadir}/apps/aktion/toolbar/ayuda.xpm
+%{_datadir}/apps/aktion/toolbar/tocar.xpm
+%{_datadir}/apps/aktion/toolbar/pause.xpm
+%{_datadir}/apps/aktion/toolbar/parar.xpm
+%{_datadir}/apps/aktion/toolbar/fileopen.xpm
+%{_datadir}/apps/aktion/toolbar/avanzar.xpm
+%{_datadir}/apps/aktion/toolbar/retroceder.xpm
+%{_datadir}/apps/aktion/toolbar/aktion.xpm
+%{_datadir}/apps/aktion/toolbar/ak_setup.xpm
+%{_datadir}/apps/aktion/toolbar/half.xpm
+%{_datadir}/apps/aktion/toolbar/double.xpm
+%{_datadir}/apps/aktion/toolbar/original.xpm
+%{_datadir}/apps/aktion/toolbar/ak_maximize.xpm
+%{_datadir}/apps/aktion/toolbar/fullscreen.xpm
+%{_datadir}/mimelnk/video/x-aktion-mpeg.kdelnk
+%{_datadir}/mimelnk/video/x-aktion-msvideo.kdelnk
+%{_datadir}/mimelnk/video/x-aktion-quicktime.kdelnk
+%{_datadir}/mimelnk/video/x-aktion-flic.kdelnk
+%{_datadir}/locale/es/LC_MESSAGES/aktion.mo
+%{_datadir}/locale/de/LC_MESSAGES/aktion.mo
+%{_datadir}/locale/hu/LC_MESSAGES/aktion.mo
+%{_datadir}/locale/fr/LC_MESSAGES/aktion.mo
+%{_datadir}/locale/sk/LC_MESSAGES/aktion.mo
+%{_datadir}/locale/it/LC_MESSAGES/aktion.mo
+%{_bindir}/aktion
%changelog
+* Sat Jul 29 2000 Stefan van der Eijk <[EMAIL PROTECTED]> 0.4.1-5mdk
+- BM
+
* Fri May 5 2000 Frederic Lepied <[EMAIL PROTECTED]> 0.4.1-4mdk
- added MimeType.
--- am-utils.spec.orig Sat Jul 29 17:42:37 2000
+++ am-utils.spec Sat Jul 29 17:45:30 2000
@@ -2,7 +2,7 @@
Name: am-utils
Version: 6.0.4
Serial: 2
-Release: 1mdk
+Release: 2mdk
Copyright: BSD
Group: System/Servers
Source: ftp://shekel.mcl.cs.columbia.edu/pub/am-utils/am-utils-%{version}.tar.bz2
@@ -12,7 +12,7 @@
Source4: am-utils.net.map.bz2
Prereq: /sbin/install-info
Requires: portmap
-BuildRoot: %{_tmppath}/am-utils-root
+BuildRoot: %{_tmppath}/%{name}-root
Prereq: /sbin/chkconfig
Prereq: grep
Obsoletes: amd
@@ -33,30 +33,30 @@
%setup -q
%build
-%configure --enable-shared --sysconfdir=/etc --enable-libs=-lnsl
--disable-amq-mount
+%configure --enable-shared --sysconfdir=%{_sysconfdir} --enable-libs=-lnsl
+--disable-amq-mount
make
%install
rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/etc/{sysconfig,rc.d/init.d}
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/{sysconfig,rc.d/init.d}
%makeinstall
bzcat %{SOURCE3} > $RPM_BUILD_ROOT/amd
-install -m 755 $RPM_BUILD_ROOT/amd $RPM_BUILD_ROOT/etc/sysconfig/amd
+install -m 755 $RPM_BUILD_ROOT/amd $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/amd
bzcat %{SOURCE1} > $RPM_BUILD_ROOT/amd
-install -m 755 $RPM_BUILD_ROOT/amd $RPM_BUILD_ROOT/etc/rc.d/init.d/amd
+install -m 755 $RPM_BUILD_ROOT/amd $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/amd
mkdir -p $RPM_BUILD_ROOT/.automount
-rm -f $RPM_BUILD_ROOT/usr/sbin/ctl-amd
+rm -f $RPM_BUILD_ROOT%{_sbindir}/ctl-amd
# install the default config and map files
bzcat %{SOURCE2} > $RPM_BUILD_ROOT/amd.conf
-install -m 600 $RPM_BUILD_ROOT/amd.conf $RPM_BUILD_ROOT/etc/amd.conf
+install -m 600 $RPM_BUILD_ROOT/amd.conf $RPM_BUILD_ROOT%{_sysconfdir}/amd.conf
bzcat %{SOURCE4} > $RPM_BUILD_ROOT/amd
-install -m 640 $RPM_BUILD_ROOT/amd $RPM_BUILD_ROOT/etc/amd.net
+install -m 640 $RPM_BUILD_ROOT/amd $RPM_BUILD_ROOT%{_sysconfdir}/amd.net
%clean
rm -rf $RPM_BUILD_ROOT
@@ -64,16 +64,16 @@
%pre
# Check if we have an old fashioned amd.conf and rename if to amd.net
if [ "$1" = "0" ] ; then
- if grep "auto_dir" /etc/amd.conf 2>/dev/null > /dev/null ; then
+ if grep "auto_dir" %{_sysconfdir}/amd.conf 2>/dev/null > /dev/null ; then
# this is okay
exit 0
else
- # this needs to be renamed. Still, if /etc/amd.net exists, then
+ # this needs to be renamed. Still, if %{_sysconfdir}/amd.net exists, then
# don't bother renamig it. RPM will handle it better than us here.
- if [ -e /etc/amd.net ] ; then
+ if [ -e %{_sysconfdir}/amd.net ] ; then
exit 0
else
- mv -f /etc/amd.conf /etc/amd.net
+ mv -f %{_sysconfdir}/amd.conf /etc/amd.net
fi
fi
fi
@@ -82,11 +82,11 @@
%post
/sbin/ldconfig
/sbin/chkconfig --add amd
-/sbin/install-info /usr/info/am-utils.info.bz2 /usr/info/dir
+/sbin/install-info %{_infodir}/am-utils.info.bz2 %{_infodir}/dir
%preun
if [ $1 = 0 ]; then
- /sbin/install-info --delete /usr/info/am-utils.info.bz2 /usr/info/dir
+ /sbin/install-info --delete %{_infodir}/am-utils.info.bz2 %{_infodir}/dir
/sbin/chkconfig --del amd
fi
@@ -96,19 +96,22 @@
%defattr(-,root,root)
%doc doc/*.ps AUTHORS BUGS ChangeLog NEWS README* scripts/*-sample
%dir /.automount
-/usr/bin/pawd
-/usr/sbin/*
-/usr/man/man[58]/*
-/usr/man/man1/pawd.1*
-%config /etc/amd.conf
-%config /etc/amd.net
-%config /etc/sysconfig/amd
-%config /etc/rc.d/init.d/amd
-/usr/info/*info*.bz2
-/usr/lib/libamu.so
-/usr/lib/libamu.so.*
+%{_bindir}/pawd
+%{_sbindir}/*
+%{_mandir}/man[58]/*
+%{_mandir}/man1/pawd.1*
+%config %{_sysconfdir}/amd.conf
+%config %{_sysconfdir}/amd.net
+%config %{_sysconfdir}/sysconfig/amd
+%config %{_sysconfdir}/rc.d/init.d/amd
+%{_infodir}/*info*.bz2
+%{_libdir}/libamu.so
+%{_libdir}/libamu.so.*
%changelog
+* Sat Jul 29 2000 Stefan van der Eijk <[EMAIL PROTECTED]> 6.0.4-2mdk
+- BM
+
* Tue Jul 11 2000 dam's <[EMAIL PROTECTED]> 6.0.4-1mdk
- updated.
--- ypserv.spec.orig Mon Jul 24 19:29:26 2000
+++ ypserv.spec Mon Jul 24 20:13:51 2000
@@ -1,6 +1,6 @@
%define name ypserv
%define version 1.3.9
-%define release 4mdk
+%define release 5mdk
Summary: The NIS (Network Information Service) server.
Summary(de): NIS/YP-Server
@@ -63,7 +63,12 @@
%build
cp etc/README etc/README.etc
-%configure --enable-tcp-wrapper --enable-fqdn --enable-yppasswd
+%configure \
+ --bindir=/usr/lib/yp \
+ --enable-fqdn \
+ --enable-tcp-wrapper \
+ --enable-yppasswd \
+ --libexecdir=/usr/lib/yp
make
%install
@@ -117,6 +122,9 @@
%{_includedir}/*/*
%changelog
+* Mon Jul 24 2000 Stefan van der Eijk <[EMAIL PROTECTED]> 1.3.9-5mdk
+- fixed path of makedbm in /var/yp/Makefile (was broken with 4mdk)
+
* Sun Jul 23 2000 Stefan van der Eijk <[EMAIL PROTECTED]> 1.3.9-4mdk
- macroszifications
- BM
