Here are some BM fixed packages. Please integrate into cooker.
Thanks!!!
Stefan
aboot-0.7a-2mdk.src.rpm
aktion-0.4.1-5mdk.src.rpm
am-utils-6.0.4-2mdk.src.rpm
blackbox-0.51.3.1-22mdk.src.rpm
netkit-base-0.16-2mdk.src.rpm
smpeg-0.4.0-2mdk.src.rpm
unixODBC-1.8.7-1mdk.src.rpm
usermode-1.22-3mdk.src.rpm
src.rpm's are being uploaded to /incoming.
--- 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 Sun Jul 30 21:30:13 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,23 @@
%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
+%{update-menus}
%postun
-if [ "$1" = 0 ]; then
- [ -x /usr/bin/update-menus ] && /usr/bin/update-menus || true
-fi
-
+%{clean-menus}
+
%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 +77,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.
--- blackbox.spec.orig Sun May 21 03:47:00 2000
+++ blackbox.spec Sun Jul 30 21:34:05 2000
@@ -1,5 +1,5 @@
%define version 0.51.3.1
-%define release 21mdk
+%define release 22mdk
Summary: A Window Manager for the X Window System
Name: blackbox
@@ -41,27 +41,27 @@
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{prefix}
-make install prefix=$RPM_BUILD_ROOT%{prefix}
+%makeinstall
-mkdir -p $RPM_BUILD_ROOT/usr/X11R6/bin
-install -m755 $RPM_BUILD_ROOT/usr/bin/* $RPM_BUILD_ROOT/usr/X11R6/bin/
+mkdir -p $RPM_BUILD_ROOT%{prefix}/X11R6/bin
+install -m755 $RPM_BUILD_ROOT%{_bindir}/* $RPM_BUILD_ROOT%{prefix}/X11R6/bin/
-mkdir -p $RPM_BUILD_ROOT/usr/X11R6/man/man1/
-install -m644 *.1 $RPM_BUILD_ROOT/usr/X11R6/man/man1/
+mkdir -p $RPM_BUILD_ROOT%{prefix}/X11R6/man/man1/
+install -m644 *.1 $RPM_BUILD_ROOT%{prefix}/X11R6/man/man1/
# Chage default theme
-pushd $RPM_BUILD_ROOT%{prefix}/share/blackbox/styles && {
+pushd $RPM_BUILD_ROOT%{_datadir}/blackbox/styles && {
mv default sleet
cp results default
rm -f stylesmenu
-install -m644 %{SOURCE2} $RPM_BUILD_ROOT%{prefix}/share/blackbox/styles
+install -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/blackbox/styles
} && popd
install -d $RPM_BUILD_ROOT/etc/menu-methods
install -m755 %{SOURCE1} $RPM_BUILD_ROOT/etc/menu-methods/%{name}
-mkdir -p $RPM_BUILD_ROOT/usr/lib/menu/
-cat << EOF > $RPM_BUILD_ROOT/usr/lib/menu/%{name}
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/menu/
+cat << EOF > $RPM_BUILD_ROOT%{_libdir}/menu/%{name}
?package(%{name}): \
needs=wm \
section=Session/Windowmanagers \
@@ -74,31 +74,31 @@
%post
-if [ -x /usr/bin/update-menus ];then
- /usr/bin/update-menus
-fi
-[ -x /usr/sbin/fndSession ] && /usr/sbin/fndSession || true
+%{update_menus}
+[ -x %{_sbindir}/fndSession ] && %{_sbindir}/fndSession || true
%postun
-if [ -x /usr/bin/update-menus ];then
- /usr/bin/update-menus
-fi
-[ -x /usr/sbin/fndSession ] && /usr/sbin/fndSession || true
+%{clean_menus}
+[ -x %{_sbindir}/fndSession ] && %{_sbindir}/fndSession || true
%clean
rm -fr $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(-,root,root)
-/usr/lib/menu/%{name}
+%{_libdir}/menu/%{name}
%config /etc/menu-methods/%{name}
-/usr/X11R6/bin/blackbox
-/usr/X11R6/bin/bsetroot
-%{prefix}/share/blackbox
+%{prefix}/X11R6/bin/blackbox
+%{prefix}/X11R6/bin/bsetroot
+%{_datadir}/blackbox
%{prefix}/X11R6/man/man1/*
%changelog
+* Sun Jul 09 2000 Stefan van der Eijk <[EMAIL PROTECTED]> 0.51.3.1-22mdk
+- makeinstall macro
+- macroszifications
+
* Sun May 21 2000 David BAUDENS <[EMAIL PROTECTED]> 0.51.3.1-21mdk
- Fix descriptions (RPM & menu)
--- netkit-base.spec.orig Sun Jul 30 12:07:55 2000
+++ netkit-base.spec Sun Jul 30 12:28:29 2000
@@ -1,5 +1,5 @@
%define version 0.16
-%define release 1mdk
+%define release 2mdk
Summary: The ping and inetd networking programs.
Name: netkit-base
@@ -12,7 +12,7 @@
Source2: inet.init
Source3: inetd.conf.5.bz2
Patch1: netkit-base-0.16-asnonroot.patch.bz2
-Patch2: ping-endianess.diff.bz2
+Patch2: ping-endianess-0.16.diff.bz2
Provides: inetd
Prereq: /sbin/chkconfig
Requires: tcp_wrappers
@@ -34,7 +34,7 @@
%setup
%patch1 -p1
%ifarch alpha
-%patch2 -p1
+%patch2 -p1
%endif
%build
@@ -92,6 +92,10 @@
%{_sbindir}/inetd
%changelog
+* Sun Jul 30 2000 Stefan van der Eijk <[EMAIL PROTECTED]> 0.16-2mdk
+- fixed alpha patch for ping (it still gives 2 unaligned traps, but then
+ seems to work OK)
+
* Wed Jul 19 2000 Chmouel Boudjnah <[EMAIL PROTECTED]> 0.16-1mdk
- BM.
- 0.16.
--- smpeg.spec.orig Sun Jul 30 13:40:19 2000
+++ smpeg.spec Sun Jul 30 20:32:57 2000
@@ -2,8 +2,8 @@
%define name smpeg
%define summary SDL MPEG Library
%define version 0.4.0
-%define release 1mdk
-%define exec %{_prefix}/bin/gtv
+%define release 2mdk
+%define exec %{_bindir}/gtv
%define section Multimedia/Video
Name: %{name}
@@ -18,7 +18,7 @@
Source3: gtv_48x48.xpm
Group: Video
URL: http://www.lokigames.com/development/smpeg.php3
-BuildRoot: /var/tmp/%{name}-%{version}-root
+BuildRoot: %{_tmppath}/%{name}-buildroot
BuildPreReq: gtk+-devel, SDL-devel >= 1.0.8
Requires: SDL >= 1.0.8
@@ -64,23 +64,24 @@
%install
rm -rf $RPM_BUILD_ROOT
-make prefix=$RPM_BUILD_ROOT/%{_prefix} install
+#make prefix=$RPM_BUILD_ROOT/%{_prefix} install
+%makeinstall
# icons
install -D %{SOURCE1} \
- $RPM_BUILD_ROOT/usr/share/icons/mini/gtv.xpm
+ $RPM_BUILD_ROOT%{_datadir}/icons/mini/gtv.xpm
install -D %{SOURCE2} \
- $RPM_BUILD_ROOT/usr/share/icons/gtv.xpm
+ $RPM_BUILD_ROOT%{_datadir}/icons/gtv.xpm
install -D %{SOURCE3} \
- $RPM_BUILD_ROOT/usr/share/icons/large/gtv.xpm
+ $RPM_BUILD_ROOT%{_datadir}/icons/large/gtv.xpm
# (fg) Menu entry
-mkdir -p $RPM_BUILD_ROOT/usr/lib/menu
-cat >$RPM_BUILD_ROOT/usr/lib/menu/gtv <<EOF
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/menu
+cat >$RPM_BUILD_ROOT%{_libdir}/menu/gtv <<EOF
?package(%{name}):\\
command="%{exec}"\\
needs="X11"\\
- icon="/usr/share/icons/gtv.xpm"\\
+ icon="%{_datadir}/icons/gtv.xpm"\\
section="%{section}"\\
title="gtv"\\
longtitle="gtv: MPEG player"
@@ -92,34 +93,36 @@
%post
/sbin/ldconfig
-## add menu entry
-[ -x /usr/bin/update-menus ] && /usr/bin/update-menus || true
+%{update_menus}
%postun
/sbin/ldconfig
-## remove menu entry
-[ "$1" = 0 ] && [ -x /usr/bin/update-menus ] && /usr/bin/update-menus || true
+%{clean_menus}
%files
%defattr(-, root, root)
%doc CHANGES COPYING README
-%{_prefix}/lib/lib*.so.*
-%{_prefix}/bin/plaympeg
-%{_prefix}/bin/gtv
-%{_prefix}/man/*
-%{_prefix}/lib/menu/gtv
-%{_prefix}/share/icons/gtv.xpm
-%{_prefix}/share/icons/mini/gtv.xpm
-%{_prefix}/share/icons/large/gtv.xpm
+%{_libdir}/lib*.so.*
+%{_bindir}/plaympeg
+%{_bindir}/gtv
+%{_mandir}/*
+%{_libdir}/menu/gtv
+%{_datadir}/icons/gtv.xpm
+%{_datadir}/icons/mini/gtv.xpm
+%{_datadir}/icons/large/gtv.xpm
%files devel
%defattr(-, root, root)
%doc CHANGES COPYING README
-%{_prefix}/bin/smpeg-config
-%{_prefix}/include/*
-%{_prefix}/lib/lib*.a
-%{_prefix}/lib/lib*.so
+%{_bindir}/smpeg-config
+%{_includedir}/*
+%{_libdir}/lib*.a
+%{_libdir}/lib*.so
%changelog
+* Sun Jul 30 2000 Stefan van der Eijk <[EMAIL PROTECTED]> 0.4.0-2mdk
+- macroszifications
+- BM
+
* Fri Jun 23 2000 Lenny Cartier <[EMAIL PROTECTED]> 0.4.0-1mdk
- v0.4.0
--- unixODBC-1.8.7.spec.orig Sun Jul 30 19:11:32 2000
+++ unixODBC-1.8.7.spec Sun Jul 30 19:38:30 2000
@@ -30,17 +30,15 @@
%patch -p1
%build
-CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" ./configure \
- --prefix=%{prefix} --sysconfdir=/etc --disable-gui
-make
+%configure --disable-gui
+%make
%install
rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/etc
-make install prefix=$RPM_BUILD_ROOT/%{prefix} sysconfdir=$RPM_BUILD_ROOT/etc
+%makeinstall
olddir=`pwd`
cd $RPM_BUILD_DIR/%{name}-%{version}
-docdir="$RPM_BUILD_ROOT/usr/doc/%{name}-%{version}"
+docdir="$RPM_BUILD_ROOT%{prefix}/doc/%{name}-%{version}"
mkdir -p $docdir
cp AUTHORS COPYING ChangeLog INSTALL NEWS README $docdir
cd doc
@@ -57,9 +55,9 @@
$RPM_BUILD_DIR/file.list.%{name}
find . -type f | sed -e 's,^\.,\%attr(-\,root\,root) ,' \
- -e '/\/etc\//s|^|%config|' \
+ -e '/\%{_sysconfdir}\//s|^|%config|' \
-e '/\/config\//s|^|%config|' \
- -e '/\/usr\/doc\//s|^|%doc|' \
+ -e '/\%{prefix}\/doc\//s|^|%doc|' \
>> $RPM_BUILD_DIR/file.list.%{name}
find . -type l | sed -e 's,^\.,\%attr(-\,root\,root) ,' >> \
@@ -76,6 +74,10 @@
%defattr(-,root,root,0755)
%changelog
+* Sun Jul 30 2000 Stefan van der Eijk <[EMAIL PROTECTED]> 1.8.7-2mdk
+- macroszifications
+- BM
+
* Thu Apr 20 2000 <[EMAIL PROTECTED]> 1.8.7-1mdk
- updated version.
--- usermode.spec.orig Sun Jul 30 20:05:46 2000
+++ usermode.spec Sun Jul 30 20:30:31 2000
@@ -1,15 +1,16 @@
Summary: Graphical tools for certain user account management tasks.
Name: usermode
Version: 1.22
-Release: 2mdk
+Release: 3mdk
Copyright: GPL
Group: System/Configuration/Other
Source: usermode-%{PACKAGE_VERSION}.tar.bz2
Source1: usermode.bz2
Source2: usermode.xpm.bz2
+Patch: usermode-Makefile.patch.bz2
Requires: util-linux pam >= 0.66-5
Conflicts: SysVinit < 2.74-14
-BuildRoot: %{_tmppath}/usermode-root
+BuildRoot: %{_tmppath}/%{name}-root
%description
The usermode package contains several graphical tools for users:
@@ -23,6 +24,7 @@
%prep
%setup
+%patch -p1
%build
make
@@ -34,18 +36,18 @@
# Stuff from pam_console, for sysvinit. Here for lack of a better
# place....
-mkdir -p $RPM_BUILD_ROOT/etc/pam.d $RPM_BUILD_ROOT/etc/security/console.apps
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d $RPM_BUILD_ROOT/etc/security/console.apps
for wrapapp in shutdown halt reboot poweroff ; do
ln -sf consolehelper $RPM_BUILD_ROOT/usr/bin/$wrapapp
touch $RPM_BUILD_ROOT/etc/security/console.apps/$wrapapp
cp shutdown.pamd $RPM_BUILD_ROOT/etc/pam.d/$wrapapp
done
-install -m 755 -d $RPM_BUILD_ROOT/usr/lib/menu
+install -m 755 -d $RPM_BUILD_ROOT%{_libdir}/menu
bunzip2 $RPM_SOURCE_DIR/usermode.bz2
bunzip2 $RPM_SOURCE_DIR/usermode.xpm.bz2
-install -m 644 $RPM_SOURCE_DIR/%{name} $RPM_BUILD_ROOT/usr/lib/menu/
-install -d $RPM_BUILD_ROOT/usr/share/icons
-install -m 644 $RPM_SOURCE_DIR/usermode.xpm $RPM_BUILD_ROOT/usr/share/icons/
+install -m 644 $RPM_SOURCE_DIR/%{name} $RPM_BUILD_ROOT%{_libdir}/menu/
+install -d $RPM_BUILD_ROOT%{_datadir}/icons
+install -m 644 $RPM_SOURCE_DIR/usermode.xpm $RPM_BUILD_ROOT%{_datadir}/icons/
bzip2 $RPM_SOURCE_DIR/usermode
bzip2 $RPM_SOURCE_DIR/usermode.xpm
@@ -54,48 +56,45 @@
%post
-## menu
-if [ -x /usr/bin/update-menus ]; then
- /usr/bin/update-menus
-fi
+%{update_menus}
%postun
-## menu
-if [ "$1" = 0 ]; then
- if [ -x /usr/bin/update-menus ]; then
- /usr/bin/update-menus
- fi
-fi
+%{clean_menus}
%files
%defattr(-,root,root)
-/usr/bin/usermount
-/usr/man/man1/usermount.1*
-/usr/bin/userinfo
-/usr/man/man1/userinfo.1*
-%attr(4755,root,root) /usr/sbin/userhelper
-/usr/man/man8/userhelper.8*
-/usr/bin/userpasswd
-/usr/man/man1/userpasswd.1*
-/usr/bin/consolehelper
-/usr/man/man8/consolehelper.8*
-%config /etc/X11/applnk/System/*
+%{_bindir}/usermount
+%{_mandir}/man1/usermount.1*
+%{_bindir}/userinfo
+%{_mandir}/man1/userinfo.1*
+%attr(4755,root,root) %{_sbindir}/userhelper
+%{_mandir}/man8/userhelper.8*
+%{_bindir}/userpasswd
+%{_mandir}/man1/userpasswd.1*
+%{_bindir}/consolehelper
+%{_mandir}/man8/consolehelper.8*
+%config %{_sysconfdir}/X11/applnk/System/*
# PAM console wrappers
-#/usr/bin/shutdown
-#/usr/bin/halt
-#/usr/bin/reboot
-#/usr/bin/poweroff
-#%config(noreplace) /etc/pam.d/shutdown
-#%config(noreplace) /etc/pam.d/halt
-#%config(noreplace) /etc/pam.d/reboot
-#%config(noreplace) /etc/pam.d/poweroff
-#%config(missingok) /etc/security/console.apps/shutdown
-#%config(missingok) /etc/security/console.apps/halt
-#%config(missingok) /etc/security/console.apps/reboot
-#%config(missingok) /etc/security/console.apps/poweroff
+#%{_bindir}/shutdown
+#%{_bindir}/halt
+#%{_bindir}/reboot
+#%{_bindir}/poweroff
+#%config(noreplace) %{_sysconfdir}/pam.d/shutdown
+#%config(noreplace) %{_sysconfdir}/pam.d/halt
+#%config(noreplace) %{_sysconfdir}/pam.d/reboot
+#%config(noreplace) %{_sysconfdir}/pam.d/poweroff
+#%config(missingok) %{_sysconfdir}/security/console.apps/shutdown
+#%config(missingok) %{_sysconfdir}/security/console.apps/halt
+#%config(missingok) %{_sysconfdir}/security/console.apps/reboot
+#%config(missingok) %{_sysconfdir}/security/console.apps/poweroff
%changelog
+* Sun Jul 30 2000 Stefan van der Eijk <[EMAIL PROTECTED]> 1.22-3mdk
+- macroszifications
+- Makefile patch for new manpage location
+- BM
+
* Tue Jul 18 2000 Vincent Danen <[EMAIL PROTECTED]> 1.22-2mdk
- remove pam console wrappers (security fix)
