Here are some BM fixed packages... I've uploaded the src.rpm's to
/incoming. Please integrate (if possible).
thanks!!
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 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.
--- cdialog-0.9a.spec.orig Sat Aug 5 12:16:59 2000
+++ cdialog-0.9a.spec Sat Aug 5 12:26:38 2000
@@ -1,13 +1,13 @@
Summary: A utility for creating TTY dialog boxes.
Name: cdialog
Version: 0.9a
-Release: 3mdk
+Release: 4mdk
Copyright: GPL
Group: Development/Other
Source: ftp://metalab.unc.edu/pub/Linux/system/console/cdialog-0.9a.tar.bz2
Obsoletes: dialog
Provides: dialog
-BuildRoot: /var/tmp/dialog-root
+BuildRoot: %{_tmppath}/%{name}-buildroot
%description
Dialog is a utility that allows you to show dialog boxes (containing
@@ -23,23 +23,15 @@
make depend
%build
-make OPTIM="$RPM_OPT_FLAGS"
+%make
%install
rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/usr/{bin,man/man1}
-
-make PREFIX=$RPM_BUILD_ROOT/usr BINDIR=$RPM_BUILD_ROOT/usr/bin
MANDIR=$RPM_BUILD_ROOT/usr/man/man1 install
-
-strip $RPM_BUILD_ROOT/usr/bin/dialog
-
-
-find $RPM_BUILD_ROOT/ -type 'f'|grep -E '.*[0-9]($|x)' | xargs file \
- | grep troff | cut -d: -f1 | xargs bzip2 -9
-
-for i in `find $RPM_BUILD_ROOT/ -type 'f' -perm '+a=x' ! -name 'lib*so*'`; do
- file $i |grep -q "not stripped" && strip $i
-done
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+%makeinstall \
+ BINDIR=$RPM_BUILD_ROOT%{_bindir} \
+ MANDIR=$RPM_BUILD_ROOT%{_mandir}/man1
%clean
rm -rf $RPM_BUILD_ROOT
@@ -47,10 +39,15 @@
%files
%defattr(-,root,root)
%doc COPYING README samples
-/usr/bin/dialog
-/usr/man/man1/dialog.1.bz2
+%{_bindir}/dialog
+%{_mandir}/man1/dialog.1.bz2
%changelog
+* Sat Aug 05 2000 Stefan van der Eijk <[EMAIL PROTECTED]> 0.9a-4mdk
+- macroszifications
+- BM
+- spec file cleanup
+
* Sat Mar 25 2000 Daouda Lo <[EMAIL PROTECTED]> 0.9a-3mdk
- fix group
--- chkconfig.spec.orig Sat Aug 5 15:57:59 2000
+++ chkconfig.spec Sat Aug 5 16:28:46 2000
@@ -1,5 +1,5 @@
%define version 1.0.8
-%define release 9mdk
+%define release 10mdk
Summary: A system tool for maintaining the /etc/rc.d hierarchy.
Name: chkconfig
@@ -42,22 +42,24 @@
LIBMHACK=-lm
%endif
-make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" LIBMHACK=$LIBMHACK
+%make LIBMHACK=$LIBMHACK
%install
rm -rf $RPM_BUILD_ROOT
-make instroot=$RPM_BUILD_ROOT install
+%makeinstall \
+ instroot=$RPM_BUILD_ROOT \
+ MANDIR=%{_mandir}
-mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
for n in 0 1 2 3 4 5 6; do
- mkdir -p $RPM_BUILD_ROOT/etc/rc.d/rc${n}.d
+ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/rc${n}.d
done
# corrected indonesian language code (it has changed from 'in' to 'id')
-mkdir -p $RPM_BUILD_ROOT/usr/share/locale/id/LC_MESSAGES
-mv $RPM_BUILD_ROOT/usr/share/locale/{in,in_ID}/LC_MESSAGES/* \
- $RPM_BUILD_ROOT/usr/share/locale/id/LC_MESSAGES || :
-rm -rf $RPM_BUILD_ROOT/usr/share/locale/{in,in_ID} || :
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/locale/id/LC_MESSAGES
+mv $RPM_BUILD_ROOT%{_datadir}/locale/{in,in_ID}/LC_MESSAGES/* \
+ $RPM_BUILD_ROOT%{_datadir}/locale/id/LC_MESSAGES || :
+rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/{in,in_ID} || :
%clean
rm -rf $RPM_BUILD_ROOT
@@ -65,17 +67,21 @@
%files
%defattr(-,root,root)
/sbin/chkconfig
-/usr/man/man8/chkconfig.8*
-%dir /etc/rc.d
-%dir /etc/rc.d/*
-/usr/share/locale/*/LC_MESSAGES/chkconfig.mo
+%{_mandir}/man8/chkconfig.8*
+%dir %{_sysconfdir}/rc.d
+%dir %{_sysconfdir}/rc.d/*
+%{_datadir}/locale/*/LC_MESSAGES/chkconfig.mo
%files -n ntsysv
%defattr(-,root,root)
-/usr/sbin/ntsysv
-/usr/man/man8/ntsysv.8*
+%{_sbindir}/ntsysv
+%{_mandir}/man8/ntsysv.8*
%changelog
+* Sat Aug 05 2000 Stefan van der Eijk <[EMAIL PROTECTED]> 1.0.8-10mdk
+- macroszifications
+- BM
+
* Tue May 30 2000 Geoffrey Lee <[EMAIL PROTECTED]> 1.0.8-9mdk
- patch: doesn't update runlevel stuff if you are not root
--- cproto-4.6.spec.orig Sat Aug 5 16:32:31 2000
+++ cproto-4.6.spec Sat Aug 5 16:34:52 2000
@@ -1,14 +1,14 @@
Summary: Generates function prototypes and variable declarations from C code.
Name: cproto
Version: 4.6
-Release: 5mdk
+Release: 6mdk
Copyright: Public Domain
Group: Development/C
Source: ftp://ftp.oce.com/pub/cproto/cproto-%{version}.tar.bz2
#Patch: cproto-4.4-gcc.patch
Patch1: cproto-4.6.1.patch.bz2
Prefix: %{_prefix}
-BuildRoot: /var/tmp/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-buildroot
Packager: Enzo Maggi <[EMAIL PROTECTED]>
%description
@@ -27,27 +27,14 @@
%setup -q
%build
-CPP="/lib/cpp" ./configure --prefix=/usr --exec-prefix=/usr
+CPP="/lib/cpp" ./configure --prefix=%{prefix} --exec-prefix=/usr
%configure --exec-prefix=%{_prefix}
-make
+%make
%install
rm -rf $RPM_BUILD_ROOT
-
-make prefix=${RPM_BUILD_ROOT}%{_prefix} bindir=${RPM_BUILD_ROOT}%{_prefix}/bin install
-
-( cd $RPM_BUILD_ROOT
- strip .%{_prefix}/bin/cproto
-)
-
-
-find $RPM_BUILD_ROOT/ -type 'f'|grep -E '.*[0-9]($|x)' | xargs file \
- | grep troff | cut -d: -f1 | xargs bzip2 -9
-
-for i in `find $RPM_BUILD_ROOT/ -type 'f' -perm '+a=x' ! -name 'lib*so*'`; do
- file $i |grep -q "not stripped" && strip $i
-done
+%makeinstall
%clean
rm -rf $RPM_BUILD_ROOT
@@ -55,10 +42,13 @@
%files
%defattr(-,root,root)
%doc CHANGES README
-%{_prefix}/bin/cproto
-%{_prefix}/man/man1/cproto.1.bz2
+%{_bindir}/cproto
+%{_mandir}/man1/cproto.1.bz2
%changelog
+* Sat Aug 05 2000 Stefan van der Eijk <[EMAIL PROTECTED]> 4.6-6mdk
+- macroszifications
+- BM
* Fri Mar 17 2000 Enzo Maggi <[EMAIL PROTECTED]> 4.6-5mdk
- fixed a bug related to the C preprocessor used (CPP)
--- drakfloppy.spec.orig Sat Aug 5 17:53:56 2000
+++ drakfloppy.spec Sat Aug 5 22:48:05 2000
@@ -3,7 +3,7 @@
Name: drakfloppy
Version: %{version}
-Release: 5mdk
+Release: 6mdk
Source0: %{name}-%{version}.tar.bz2
Source1: %{name}
Source2: %{name}16.xpm.bz2
@@ -11,7 +11,7 @@
Source4: %{name}48.xpm.bz2
Copyright: GPL
-BuildRoot: /var/tmp/%{name}-%{version}
+BuildRoot: %{_tmppath}/%{name}-buildroot
Summary: Graphical front end of mkbootdisk.
Prereq: gtk+
@@ -24,6 +24,10 @@
Graphical front end of mkbootdisk. You can make standard boot disk, and add specific
modules.
%changelog
+* Thu Aug 03 2000 Stefan van der Eijk <[EMAIL PROTECTED]> 0.30-6mdk
+- macroszifications
+- BM
+
* Tue Jun 6 2000 Chmouel Boudjnah <[EMAIL PROTECTED]> 0.30-5mdk
- Requires: /sbin/mkbootdisk only on ia32 arch.
@@ -57,31 +61,30 @@
%setup -n %{name}-%{version}
%build
-make CFLAGS="$RPM_OPT_FLAGS"
+%make
%install
-mkdir -p $RPM_BUILD_ROOT/usr/{bin,man/man1}
-make version=%{version} prefix=$RPM_BUILD_ROOT MANDIR=$RPM_BUILD_ROOT/usr/man/man1
install
-install -m 755 -d $RPM_BUILD_ROOT/usr/lib/menu
-install -m 644 %SOURCE1 $RPM_BUILD_ROOT/usr/lib/menu/
-install -m 755 -d $RPM_BUILD_ROOT/usr/share/icons/mini
-bzcat %SOURCE2 > $RPM_BUILD_ROOT/usr/share/icons/mini/%{name}.xpm
-install -m 755 -d $RPM_BUILD_ROOT/usr/share/icons
-bzcat %SOURCE3 > $RPM_BUILD_ROOT/usr/share/icons/%{name}.xpm
-install -m 755 -d $RPM_BUILD_ROOT/usr/share/icons/large
-bzcat %SOURCE4 > $RPM_BUILD_ROOT/usr/share/icons/large/%{name}.xpm
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+%makeinstall \
+ version=%{version} \
+ MANDIR=$RPM_BUILD_ROOT%{_mandir}/man1 \
+ prefix=$RPM_BUILD_ROOT
+
+install -m 755 -d $RPM_BUILD_ROOT%{_libdir}/menu
+install -m 644 %SOURCE1 $RPM_BUILD_ROOT%{_libdir}/menu/
+install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/icons/mini
+bzcat %SOURCE2 > $RPM_BUILD_ROOT%{_datadir}/icons/mini/%{name}.xpm
+install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/icons
+bzcat %SOURCE3 > $RPM_BUILD_ROOT%{_datadir}/icons/%{name}.xpm
+install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/icons/large
+bzcat %SOURCE4 > $RPM_BUILD_ROOT%{_datadir}/icons/large/%{name}.xpm
%post
-if [ -x /usr/bin/update-menus ]; then
- /usr/bin/update-menus
-fi
+%{update-menus}
%postun
-if [ "$1" = 0 ]; then
- if [ -x /usr/bin/update-menus ]; then
- /usr/bin/update-menus
- fi
-fi
+%{clean-menus}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -90,9 +93,9 @@
%files
%defattr(-,root,root)
/usr/X11R6/bin/*
-/usr/share/locale/*/LC_MESSAGES/drakfloppy.mo
-/usr/man/man1/drakfloppy.1*
-/usr/lib/menu/*
-/usr/share/icons/large/*
-/usr/share/icons/mini/*
-/usr/share/icons/%{name}.xpm
+%{_datadir}/locale/*/LC_MESSAGES/drakfloppy.mo
+%{_mandir}/man1/drakfloppy.1*
+%{_libdir}/menu/*
+%{_datadir}/icons/large/*
+%{_datadir}/icons/mini/*
+%{_datadir}/icons/%{name}.xpm
--- drakfont.spec.orig Sat Aug 5 22:49:52 2000
+++ drakfont.spec Sat Aug 5 22:53:50 2000
@@ -3,7 +3,7 @@
Name: drakfont
Version: %{version}
-Release: 14mdk
+Release: 15mdk
Source0: %{name}-%{version}.tar.bz2
Source1: drakfont
Source2: drakfont.xpm.bz2
@@ -11,10 +11,10 @@
Source4: drakfont48.xpm.bz2
Source5: drakfont.init
Copyright: GPL
-BuildRoot: /var/tmp/%{name}-%{version}
+BuildRoot: %{_tmppath}/%{name}-buildroot
Summary: TrueType fonts manager
-Prereq: /usr/sbin/ttmkfdir /usr/sbin/chkfontpath /bin/su /bin/gzip gtk+
+Prereq: %{_sbindir}/ttmkfdir %{_sbindir}/chkfontpath /bin/su /bin/gzip gtk+
Requires: kdesu gtk+mdk
BuildRequires: gtk+mdk-devel
Group: %{group}
@@ -22,6 +22,10 @@
Fonts manager. You can add new fonts, remove fonts, and get Windows fonts.
%changelog
+* Thu Aug 03 2000 Stefan van der Eijk <[EMAIL PROTECTED]> 0.40-15mdk
+- macroszifications
+- BM
+
* Wed May 24 2000 Chmouel Boudjnah <[EMAIL PROTECTED]> 0.40-14mdk
- drakfont.c (create_window1): Don't try to get Windows fonts on alpha/sparc.
@@ -126,40 +130,38 @@
%setup -n %{name}-%{version}
%build
-make CFLAGS="$RPM_OPT_FLAGS"
+%make
%install
-mkdir -p $RPM_BUILD_ROOT/usr/{bin,man/man1}
-make version=%{version} prefix=$RPM_BUILD_ROOT MANDIR=$RPM_BUILD_ROOT/usr/man/man1
install
-install -m 755 -d $RPM_BUILD_ROOT/usr/lib/menu
-install -m 644 %SOURCE1 $RPM_BUILD_ROOT/usr/lib/menu/
-install -m 755 -d $RPM_BUILD_ROOT/usr/share/icons/mini
-bzcat %SOURCE2 > $RPM_BUILD_ROOT/usr/share/icons/mini/drakfont.xpm
-install -m 644 %SOURCE2 $RPM_BUILD_ROOT/usr/share/icons/mini/
-bzcat %SOURCE3 > $RPM_BUILD_ROOT/usr/share/icons/drakfont.xpm
-install -m 755 -d $RPM_BUILD_ROOT/usr/share/icons/large
-bzcat %SOURCE4 > $RPM_BUILD_ROOT/usr/share/icons/large/drakfont.xpm
-install -m 755 -d $RPM_BUILD_ROOT/etc/rc.d/init.d/
-install -m 755 %SOURCE5 $RPM_BUILD_ROOT/etc/rc.d/init.d/drakfont
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+%makeinstall \
+ version=%{version} \
+ prefix=$RPM_BUILD_ROOT \
+ MANDIR=$RPM_BUILD_ROOT%{_mandir}/man1
+install -m 755 -d $RPM_BUILD_ROOT%{_libdir}/menu
+install -m 644 %SOURCE1 $RPM_BUILD_ROOT%{_libdir}/menu/
+install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/icons/mini
+bzcat %SOURCE2 > $RPM_BUILD_ROOT%{_datadir}/icons/mini/drakfont.xpm
+install -m 644 %SOURCE2 $RPM_BUILD_ROOT%{_datadir}/icons/mini/
+bzcat %SOURCE3 > $RPM_BUILD_ROOT%{_datadir}/icons/drakfont.xpm
+install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/icons/large
+bzcat %SOURCE4 > $RPM_BUILD_ROOT%{_datadir}/icons/large/drakfont.xpm
+install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/
+install -m 755 %SOURCE5 $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/drakfont
%post
-install -m 755 -d $RPM_BUILD_ROOT/usr/X11R6/lib/X11/fonts/drakfont
-install -m 755 -d $RPM_BUILD_ROOT/usr/X11R6/lib/X11/fonts/pcf_drakfont
-/usr/X11R6/bin/drakfont -c
+install -m 755 -d $RPM_BUILD_ROOT%{prefix}/X11R6/lib/X11/fonts/drakfont
+install -m 755 -d $RPM_BUILD_ROOT%{prefix}/X11R6/lib/X11/fonts/pcf_drakfont
+%{prefix}/X11R6/bin/drakfont -c
/sbin/chkconfig --add drakfont
-if [ -x /usr/bin/update-menus ]; then
- /usr/bin/update-menus
-fi
+%{update-menus}
%postun
if [ $1 = 0 ]; then
/sbin/chkconfig --del drakfont
fi
-if [ "$1" = 0 ]; then
- if [ -x /usr/bin/update-menus ]; then
- /usr/bin/update-menus
- fi
-fi
+%{clean-menus}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -168,12 +170,12 @@
%files
%defattr(-,root,root)
/usr/X11R6/bin/drakfont
-#%dir /usr/X11R6/lib/X11/fonts/drakfont
-#%dir /usr/X11R6/lib/X11/fonts/pcf_drakfont
-/usr/share/locale/*/LC_MESSAGES/drakfont.mo
-/usr/man/man1/drakfont.1*
-/usr/lib/menu/*
-/usr/share/icons/drakfont.xpm
-/usr/share/icons/mini/drakfont.xpm
-/usr/share/icons/large/drakfont.xpm
-%config /etc/rc.d/init.d/drakfont
+#%dir %{prefix}/X11R6/lib/X11/fonts/drakfont
+#%dir %{prefix}/X11R6/lib/X11/fonts/pcf_drakfont
+%{_datadir}/locale/*/LC_MESSAGES/drakfont.mo
+%{_mandir}/man1/drakfont.1*
+%{_libdir}/menu/*
+%{_datadir}/icons/drakfont.xpm
+%{_datadir}/icons/mini/drakfont.xpm
+%{_datadir}/icons/large/drakfont.xpm
+%config %{_sysconfdir}/rc.d/init.d/drakfont
--- e-conf.spec.orig Sat Aug 5 22:54:56 2000
+++ e-conf.spec Sat Aug 5 23:26:21 2000
@@ -1,6 +1,6 @@
# Note that this is NOT a relocatable package
%define ver 0.15
-%define rel 13mdk
+%define rel 14mdk
%define prefix /usr
Summary: Enlightenment Configuration applet.
@@ -10,10 +10,9 @@
Copyright: GPL
Group: Graphical desktop/Enlightenment
Source: ftp://www.rasterman.com/pub/enlightenment/enlightenment-conf-%{ver}.tar.bz2
-BuildRoot: /var/tmp/e-conf-%{PACKAGE_VERSION}-root
+BuildRoot: %{_tmppath}/%{name}-buildroot
URL: http://www.rasterman.com
-Docdir: %{prefix}/doc
Requires: control-center >= 1.0.0
BuildRequires: control-center-devel
@@ -22,7 +21,6 @@
Patch2: enlightenment-conf-0.15-locale.patch.bz2
Patch3: enlightenment-conf-0.15-alpha-notrans.patch.bz2
-
%description
A Configuration tool for easily setting up Enlightenment
@@ -35,16 +33,9 @@
%patch2 -p1 -b .locale
%patch3 -p1 -b .alpha-notrans
-
%build
%configure
-
-if [ x"$SMP" != x"" ]; then
- (make MAKE="make -j $SMP -k"; exit 0)
- make
-else
- make
-fi
+%make
%install
rm -rf $RPM_BUILD_ROOT
@@ -66,6 +57,10 @@
%{_datadir}/locale/*/*/*
%changelog
+* Sat Aug 05 2000 Stefan van der Eijk <[EMAIL PROTECTED]> 0.15-14mdk
+- some more macros ;-)
+- BM
+
* Tue Jul 11 2000 Stefan van der Eijk <[EMAIL PROTECTED]> 0.15-13mdk
- macros
--- faces.spec.orig Sun Aug 6 09:36:18 2000
+++ faces.spec Sun Aug 6 09:42:44 2000
@@ -1,7 +1,7 @@
Summary: A list monitor with a visual output.
Name: faces
Version: 1.6.1
-Release: 10mdk
+Release: 11mdk
Copyright: freeware
Group: Networking/Mail
Source: ftp://ftp.cs.indiana.edu/pub/faces/faces/faces-1.6.1.tar.bz2
@@ -13,7 +13,7 @@
Patch3: faces-1.6.1-fix.patch.bz2
Patch4: faces-1.6.1-ikon2xbm.patch.bz2
Requires: libgr-progs
-BuildRoot: /var/tmp/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-buildroot
%description
Faces is a program for visually monitoring a list (typically a list of
@@ -67,86 +67,84 @@
%patch4 -p1 -b .ikon2xbm
%build
-make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" -f Makefile.dist x11
+%make -f Makefile.dist x11
%install
rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/usr/{bin,include,lib,man/man1,man/man3}
-
-make -f Makefile.dist \
- BINDIR=$RPM_BUILD_ROOT/usr/bin \
- LIBDIR=$RPM_BUILD_ROOT/usr/lib \
- MANDIR=$RPM_BUILD_ROOT/usr/man \
- install
-
-install -m644 compface/compface.h $RPM_BUILD_ROOT/usr/include/compface.h
-
-mkdir -p $RPM_BUILD_ROOT/usr/lib/faces
-
-bzip2 -9f $RPM_BUILD_ROOT/usr/man/*/*
-
-mkdir -p $RPM_BUILD_ROOT/usr/lib/menu
-install -m644 %{SOURCE1} $RPM_BUILD_ROOT/usr/lib/menu/faces
-mkdir -p $RPM_BUILD_ROOT/usr/share/icons/mini
-install -m644 %{SOURCE2} $RPM_BUILD_ROOT/usr/share/icons/mini/faces.xpm
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/mini
+mkdir -p $RPM_BUILD_ROOT%{_includedir}
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/{faces,menu}
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/{man1,man3}
+
+%makeinstall \
+ -f Makefile.dist \
+ BINDIR=$RPM_BUILD_ROOT%{_bindir} \
+ LIBDIR=$RPM_BUILD_ROOT%{_libdir} \
+ MANDIR=$RPM_BUILD_ROOT%{_mandir}
+
+install -m644 compface/compface.h $RPM_BUILD_ROOT%{_includedir}/compface.h
+install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/menu/faces
+install -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/icons/mini/faces.xpm
%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)
-/usr/share/icons/mini/faces.xpm
-/usr/lib/menu/faces
-/usr/bin/compface
-/usr/man/man1/compface.1.*
-/usr/man/man3/compface.3.*
-/usr/bin/icon2ikon
-/usr/bin/ikon2icon
-/usr/bin/fs2ikon
-/usr/bin/rs2icon
-/usr/bin/fs2xbm
-/usr/bin/xbm2ikon
-/usr/bin/xbmcut48
-/usr/bin/xbmsize48
-/usr/bin/addxface
-/usr/bin/mailq.faces
-/usr/bin/from.faces
-/usr/bin/lpqall.faces
-/usr/bin/rotary.faces
-/usr/bin/facesaddr
-/usr/bin/facesall
-/usr/bin/mkfacesindex
-/usr/bin/newscheck.faces
-/usr/bin/newsfrom.faces
-/usr/bin/faces
-/usr/bin/face_update
-/usr/bin/faces.sendmail
-/usr/man/man1/faces.1.*
-/usr/man/man1/face_update.1.*
-/usr/lib/faces
+%{_datadir}/icons/mini/faces.xpm
+%{_libdir}/menu/faces
+%{_bindir}/compface
+%{_mandir}/man1/compface.1.*
+%{_mandir}/man3/compface.3.*
+%{_bindir}/icon2ikon
+%{_bindir}/ikon2icon
+%{_bindir}/fs2ikon
+%{_bindir}/rs2icon
+%{_bindir}/fs2xbm
+%{_bindir}/xbm2ikon
+%{_bindir}/xbmcut48
+%{_bindir}/xbmsize48
+%{_bindir}/addxface
+%{_bindir}/mailq.faces
+%{_bindir}/from.faces
+%{_bindir}/lpqall.faces
+%{_bindir}/rotary.faces
+%{_bindir}/facesaddr
+%{_bindir}/facesall
+%{_bindir}/mkfacesindex
+%{_bindir}/newscheck.faces
+%{_bindir}/newsfrom.faces
+%{_bindir}/faces
+%{_bindir}/face_update
+%{_bindir}/faces.sendmail
+%{_mandir}/man1/faces.1.*
+%{_mandir}/man1/face_update.1.*
+%{_libdir}/faces
%files xface
%defattr(-,root,root)
-/usr/bin/uncompface
-/usr/man/man1/uncompface.1.*
-/usr/man/man3/uncompface.3.*
-/usr/bin/ikon2xbm
+%{_bindir}/uncompface
+%{_mandir}/man1/uncompface.1.*
+%{_mandir}/man3/uncompface.3.*
+%{_bindir}/ikon2xbm
%files devel
%defattr(-,root,root)
-/usr/include/compface.h
-/usr/lib/libcompface.a
+%{_includedir}/compface.h
+%{_libdir}/libcompface.a
%changelog
+* Sun Aug 06 2000 Stefan van der Eijk <[EMAIL PROTECTED]> 1.6.1-11mdk
+- macroszifications
+- BM
+
* Sun Apr 02 2000 Jerome Martin <[EMAIL PROTECTED]> 1.6.1-10mdk
- add mini icon for menus
- add menu entries
--- fnlib.spec.orig Sun Aug 6 09:44:24 2000
+++ fnlib.spec Sun Aug 6 13:28:44 2000
@@ -1,6 +1,6 @@
# Note that this is NOT a relocatable package
%define ver 0.5
-%define rel 1mdk
+%define rel 2mdk
%define prefix /usr
Summary: Color font rendering library for X11R6.
@@ -11,10 +11,9 @@
Group: System/Libraries
Source: ftp://www.rasterman.com/pub/enlightenment/libs/fnlib/fnlib-%{ver}.tar.bz2
Obsoletes: Fnlib
-BuildRoot: /var/tmp/fnlib-%{ver}-root
+BuildRoot: %{_tmppath}/%{name}-buildroot
URL: http://www.rasterman.com/
-Docdir: %{prefix}/doc
Requires: imlib
%description
@@ -35,13 +34,17 @@
%build
libtoolize --force
-CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%prefix --sysconfdir=/etc
-make
+%configure
+%make
%install
rm -rf $RPM_BUILD_ROOT
-make prefix=$RPM_BUILD_ROOT%{prefix} sysconfdir=$RPM_BUILD_ROOT/etc install
+%makeinstall \
+ DESTDIR=$RPM_BUILD_ROOT \
+ includedir=%{_includedir} \
+ libdir=%{_libdir} \
+ sysconfdir=%{_sysconfdir}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -55,9 +58,9 @@
%doc README
-%config /etc/fnrc
-%{prefix}/lib/lib*.so.*
-%{prefix}/share/fnlib_fonts/*
+%config %{_sysconfdir}/fnrc
+%{_libdir}/lib*.so.*
+%{_datadir}/fnlib_fonts/*
%files devel
%defattr(-, root, root)
@@ -65,11 +68,15 @@
%doc doc/index.html
%doc doc/fontinfo.README
-%{prefix}/lib/lib*.so
-%{prefix}/lib/*a
-%{prefix}/include/*
+%{_libdir}/lib*.so
+%{_libdir}/*a
+%{_includedir}/*
%changelog
+* Sun Aug 06 2000 Stefan van der Eijk <[EMAIL PROTECTED]> 0.5-2mdk
+- macroszifications
+- BM
+
* Wed Jun 7 2000 Pixel <[EMAIL PROTECTED]> 0.5-1mdk
- new version
--- fonts-ttf-big5.spec.orig Sun Aug 6 13:32:46 2000
+++ fonts-ttf-big5.spec Sun Aug 6 13:35:34 2000
@@ -1,5 +1,5 @@
%define version 1.0
-%define release 5mdk
+%define release 6mdk
Summary: Chinese (Big5) TTF fonts
Name: fonts-ttf-big5
@@ -7,18 +7,18 @@
Release: %{release}
Icon: fonts-ttf-big5-logo.xpm
Source0: ftp://linux.tmtc.edu.tw/pub/arphic/fonts-ttf-chinese.tar.bz2
-Copyright: GPL-like (see /usr/doc/fonts-ttf-big5/arphicpl.txt)
+Copyright: GPL-like (see /usr/share/doc/fonts-ttf-big5/arphicpl.txt)
Group: System/Fonts/True type
BuildArch: noarch
BuildRoot: /var/tmp/fonts-ttf-chinese-root
-Prereq: /usr/sbin/chkfontpath /usr/bin/killall
+Prereq: %{_sbindir}/chkfontpath %{_bindir}/killall
%description
Chinese (Big5 encoded) TTF Fonts donated by Arphic company.
%package -n fonts-ttf-gb2312
Summary: Chinese (GB2312) TTF fonts
-Copyright: GPL-like (see /usr/doc/fonts-ttf-big5/arphicpl.txt)
+Copyright: GPL-like (see /usr/share/doc/fonts-ttf-big5/arphicpl.txt)
Icon: fonts-ttf-gb2312-logo.xpm
Group: System/Fonts/True type
@@ -36,14 +36,14 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/usr/share/fonts/ttf/big5
-install -d $RPM_BUILD_ROOT/usr/share/fonts/ttf/gb2312
-install -m 0644 b*.ttf $RPM_BUILD_ROOT/usr/share/fonts/ttf/big5
-install -m 0644 g*.ttf $RPM_BUILD_ROOT/usr/share/fonts/ttf/gb2312
+install -d $RPM_BUILD_ROOT%{_datadir}/fonts/ttf/big5
+install -d $RPM_BUILD_ROOT%{_datadir}/fonts/ttf/gb2312
+install -m 0644 b*.ttf $RPM_BUILD_ROOT%{_datadir}/fonts/ttf/big5
+install -m 0644 g*.ttf $RPM_BUILD_ROOT%{_datadir}/fonts/ttf/gb2312
cat fonts.dir.big5 \
- > $RPM_BUILD_ROOT/usr/share/fonts/ttf/big5/fonts.dir
+ > $RPM_BUILD_ROOT%{_datadir}/fonts/ttf/big5/fonts.dir
cat fonts.dir.gb2312 \
- > $RPM_BUILD_ROOT/usr/share/fonts/ttf/gb2312/fonts.dir
+ > $RPM_BUILD_ROOT%{_datadir}/fonts/ttf/gb2312/fonts.dir
echo -n "\
@@ -51,13 +51,13 @@
the fonts.dir that ttmkfdir doesn't yet create automatically;
it is better you don't change it; use another directory for
your manually added fonts
-" > $RPM_BUILD_ROOT/usr/share/fonts/ttf/big5/README
-cp $RPM_BUILD_ROOT/usr/share/fonts/ttf/big5/README \
- $RPM_BUILD_ROOT/usr/share/fonts/ttf/gb2312
+" > $RPM_BUILD_ROOT%{_datadir}/fonts/ttf/big5/README
+cp $RPM_BUILD_ROOT%{_datadir}/fonts/ttf/big5/README \
+ $RPM_BUILD_ROOT%{_datadir}/fonts/ttf/gb2312
%post
-if [ -x /usr/sbin/chkfontpath ]; then
- /usr/sbin/chkfontpath -q -a /usr/share/fonts/ttf/big5
+if [ -x %{_sbindir}/chkfontpath ]; then
+ %{_sbindir}/chkfontpath -q -a %{_datadir}/fonts/ttf/big5
killall -USR1 xfs || killall -USR1 xtt || killall -USR1 xfsft
if [ -n "$DISPLAY" ]; then
xset fp rehash
@@ -68,8 +68,8 @@
fi
%post -n fonts-ttf-gb2312
-if [ -x /usr/sbin/chkfontpath ]; then
- /usr/sbin/chkfontpath -q -a /usr/share/fonts/ttf/gb2312
+if [ -x %{_sbindir}/chkfontpath ]; then
+ %{_sbindir}/chkfontpath -q -a %{_datadir}/fonts/ttf/gb2312
killall -USR1 xfs || killall -USR1 xtt || killall -USR1 xfsft
if [ -n "$DISPLAY" ]; then
xset fp rehash
@@ -82,8 +82,8 @@
%postun
# 0 means a real uninstall
if [ "$1" = "0" ]; then
- [ -x /usr/sbin/chkfontpath ] && \
- /usr/sbin/chkfontpath -q -r /usr/share/fonts/ttf/big5
+ [ -x %{_sbindir}/chkfontpath ] && \
+ %{_sbindir}/chkfontpath -q -r %{_datadir}/fonts/ttf/big5
fi
killall -USR1 xfs || killall -USR1 xtt || killall -USR1 xfsft
if [ -n "$DISPLAY" ]; then
@@ -93,8 +93,8 @@
%postun -n fonts-ttf-gb2312
# 0 means a real uninstall
if [ "$1" = "0" ]; then
- [ -x /usr/sbin/chkfontpath ] && \
- /usr/sbin/chkfontpath -q -r /usr/share/fonts/ttf/gb2312
+ [ -x %{_sbindir}/chkfontpath ] && \
+ %{_sbindir}/chkfontpath -q -r %{_datadir}/fonts/ttf/gb2312
fi
killall -USR1 xfs || killall -USR1 xtt || killall -USR1 xfsft
if [ -n "$DISPLAY" ]; then
@@ -122,6 +122,11 @@
%config %{_datadir}/fonts/ttf/gb2312/fonts.dir
%changelog
+* Sun Aug 06 2000 Stefan van der Eijk <[EMAIL PROTECTED]> 1.0-6mdk
+- modified location license file --> usr/doc --> usr/share/doc
+- macroszifications
+- BM
+
* Wed Jul 5 2000 dam's <[EMAIL PROTECTED]> 1.0-5mdk
- mandrake release
--- fortune-mod.spec.orig Sun Aug 6 15:00:28 2000
+++ fortune-mod.spec Sun Aug 6 15:20:16 2000
@@ -1,5 +1,5 @@
%define ver 1.0
-%define release 27mdk
+%define release 28mdk
Summary: A program which will display a fortune.
Summary(cs): Program suenka s vitbou (fortune cookie) s opravami chyb
@@ -41,7 +41,7 @@
Patch0: fortune-mod-offense.patch.bz2
Patch1: fortune-mod-1.0-i18n.diff.bz2
-BuildRoot: /var/tmp/fortune-mod-root
+BuildRoot: %{_tmppath}/%{name}-buildroot
%description
Fortune-mod contains the ever-popular fortune program. Want a little
@@ -106,21 +106,24 @@
%patch1 -p1 -b .i18n
%build
-make
+%make
%install
rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/usr/{games,sbin,man/man1,man/man6,share/games/fortunes}
+mkdir -p $RPM_BUILD_ROOT/usr/games
+mkdir -p $RPM_BUILD_ROOT%{_sbindir}
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/{man1,man6}
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/games/fortunes
+
+%makeinstall \
+ BINDIR=$RPM_BUILD_ROOT%{_sbindir} \
+ BINMANDIR=$RPM_BUILD_ROOT%{_mandir}/man1 \
+ COOKIEDIR=$RPM_BUILD_ROOT%{_datadir}/games/fortunes \
+ FORTDIR=$RPM_BUILD_ROOT/usr/games \
+ FORTMANDIR=$RPM_BUILD_ROOT%{_mandir}/man6
-make FORTDIR=$RPM_BUILD_ROOT/usr/games \
- COOKIEDIR=$RPM_BUILD_ROOT/usr/share/games/fortunes \
- BINDIR=$RPM_BUILD_ROOT/usr/sbin \
- BINMANDIR=$RPM_BUILD_ROOT/usr/man/man1 \
- FORTMANDIR=$RPM_BUILD_ROOT/usr/man/man6 \
- install
-
-mkdir -p $RPM_BUILD_ROOT/usr/bin/
-cp util/rot $RPM_BUILD_ROOT/usr/bin
+mkdir -p $RPM_BUILD_ROOT%{_bindir}/
+cp util/rot $RPM_BUILD_ROOT%{_bindir}
# extra english fortunes
mkdir en
@@ -128,7 +131,7 @@
bzcat %{SOURCE6} > en/MS-FORTUNES
chmod -R a+rX en
-cp en/* $RPM_BUILD_ROOT/usr/share/games/fortunes/
+cp en/* $RPM_BUILD_ROOT%{_datadir}/games/fortunes/
# Czech fortunes
mkdir cs
@@ -139,7 +142,7 @@
&& mv fortune-cs-1.2.4/* cs/
chmod -R a+rX cs
-cp -var cs $RPM_BUILD_ROOT/usr/share/games/fortunes/
+cp -var cs $RPM_BUILD_ROOT%{_datadir}/games/fortunes/
# Spanish fortunes
mkdir es
@@ -148,7 +151,7 @@
bzcat %{SOURCE11} > es/deprimente
chmod -R a+rX es
-cp -var es $RPM_BUILD_ROOT/usr/share/games/fortunes/
+cp -var es $RPM_BUILD_ROOT%{_datadir}/games/fortunes/
# French fortunes
mkdir fr
@@ -163,7 +166,7 @@
mkdir doc/fr/ffr && mv ffr/* doc/fr/ffr/
chmod -R a+rX fr
-cp -var fr $RPM_BUILD_ROOT/usr/share/games/fortunes/
+cp -var fr $RPM_BUILD_ROOT%{_datadir}/games/fortunes/
# Gaeilge (Irish Gaelic) fortunes
mkdir ga
@@ -173,7 +176,7 @@
EOF
chmod -R a+rX ga
-cp -var ga $RPM_BUILD_ROOT/usr/share/games/fortunes/
+cp -var ga $RPM_BUILD_ROOT%{_datadir}/games/fortunes/
# Hungarian fortunes
mkdir hu
@@ -183,7 +186,7 @@
&& mv fortunes-hu/hu/magyar hu/
chmod -R a+rX hu
-cp -var hu $RPM_BUILD_ROOT/usr/share/games/fortunes/
+cp -var hu $RPM_BUILD_ROOT%{_datadir}/games/fortunes/
# Indonesian fortunes
mkdir id
@@ -192,7 +195,7 @@
mv fortune-msg-id/* id/
chmod -R a+rX id
-cp -var id $RPM_BUILD_ROOT/usr/share/games/fortunes/
+cp -var id $RPM_BUILD_ROOT%{_datadir}/games/fortunes/
# Italian fortunes
mkdir it
@@ -203,7 +206,7 @@
mv fortune.it-1.51/* it/
chmod -R a+rX it
-cp -var it $RPM_BUILD_ROOT/usr/share/games/fortunes/
+cp -var it $RPM_BUILD_ROOT%{_datadir}/games/fortunes/
# Japanese fortunes
mkdir ja
@@ -211,7 +214,7 @@
bzcat %{SOURCE13} > ja/kotowaza ; bzcat %{SOURCE14} > doc/ja/kotowaza.README
chmod -R a+rX ja
-cp -var ja $RPM_BUILD_ROOT/usr/share/games/fortunes/
+cp -var ja $RPM_BUILD_ROOT%{_datadir}/games/fortunes/
# Walloon fortunes
mkdir wa
@@ -220,14 +223,14 @@
bzcat %{SOURCE16} > wa/walon
chmod -R a+rX wa
-cp -var wa $RPM_BUILD_ROOT/usr/share/games/fortunes/
+cp -var wa $RPM_BUILD_ROOT%{_datadir}/games/fortunes/
(
- cd $RPM_BUILD_ROOT/usr/share/games/fortunes/
+ cd $RPM_BUILD_ROOT%{_datadir}/games/fortunes/
find * -name "*.dat" | xargs rm
for i in `find * -type f` ; do
- $RPM_BUILD_ROOT/usr/sbin/strfile $i
+ $RPM_BUILD_ROOT%{_sbindir}/strfile $i
done
)
@@ -238,8 +241,8 @@
file $i |grep -q "not stripped" && strip $i
done
-rm $RPM_BUILD_ROOT/usr/man/man1/unstr.1
-ln -s strfile.1.bz2 $RPM_BUILD_ROOT/usr/man/man1/unstr.1.bz2
+rm $RPM_BUILD_ROOT%{_mandir}/man1/unstr.1
+ln -s strfile.1.bz2 $RPM_BUILD_ROOT%{_mandir}/man1/unstr.1.bz2
%clean
rm -rf $RPM_BUILD_ROOT
@@ -258,99 +261,103 @@
%lang(ja) %doc doc/ja
#%lang(wa) %doc doc/wa
%attr(755,root,root)/usr/games/fortune
-%attr(755,root,root)/usr/sbin/strfile
-%attr(755,root,root)/usr/sbin/unstr
-%attr(755,root,root)/usr/bin/rot
-%lang(cs) /usr/share/games/fortunes/cs
-%lang(es) /usr/share/games/fortunes/es
-%lang(fr) /usr/share/games/fortunes/fr
-%lang(ga) /usr/share/games/fortunes/ga
-%lang(hu) /usr/share/games/fortunes/hu
-%lang(id) /usr/share/games/fortunes/id
-%lang(it) /usr/share/games/fortunes/it
-%lang(ja) /usr/share/games/fortunes/ja
-%lang(wa) /usr/share/games/fortunes/wa
-
-%dir /usr/share/games/fortunes
-/usr/share/games/fortunes/MS-FORTUNES
-/usr/share/games/fortunes/MS-FORTUNES.dat
-/usr/share/games/fortunes/art
-/usr/share/games/fortunes/art.dat
-/usr/share/games/fortunes/ascii-art
-/usr/share/games/fortunes/ascii-art.dat
-/usr/share/games/fortunes/computers
-/usr/share/games/fortunes/computers.dat
-/usr/share/games/fortunes/cookie
-/usr/share/games/fortunes/cookie.dat
-/usr/share/games/fortunes/definitions
-/usr/share/games/fortunes/definitions.dat
-/usr/share/games/fortunes/drugs
-/usr/share/games/fortunes/drugs.dat
-/usr/share/games/fortunes/education
-/usr/share/games/fortunes/education.dat
-/usr/share/games/fortunes/ethnic
-/usr/share/games/fortunes/ethnic.dat
-/usr/share/games/fortunes/food
-/usr/share/games/fortunes/food.dat
-/usr/share/games/fortunes/fortunes
-/usr/share/games/fortunes/fortunes.dat
-/usr/share/games/fortunes/goedel
-/usr/share/games/fortunes/goedel.dat
-/usr/share/games/fortunes/humorists
-/usr/share/games/fortunes/humorists.dat
-/usr/share/games/fortunes/kids
-/usr/share/games/fortunes/kids.dat
-/usr/share/games/fortunes/law
-/usr/share/games/fortunes/law.dat
-/usr/share/games/fortunes/linuxcookie
-/usr/share/games/fortunes/linuxcookie.dat
-/usr/share/games/fortunes/literature
-/usr/share/games/fortunes/literature.dat
-/usr/share/games/fortunes/love
-/usr/share/games/fortunes/love.dat
-/usr/share/games/fortunes/magic
-/usr/share/games/fortunes/magic.dat
-/usr/share/games/fortunes/medicine
-/usr/share/games/fortunes/medicine.dat
-/usr/share/games/fortunes/men-women
-/usr/share/games/fortunes/men-women.dat
-/usr/share/games/fortunes/miscellaneous
-/usr/share/games/fortunes/miscellaneous.dat
-/usr/share/games/fortunes/news
-/usr/share/games/fortunes/news.dat
-/usr/share/games/fortunes/people
-/usr/share/games/fortunes/people.dat
-/usr/share/games/fortunes/pets
-/usr/share/games/fortunes/pets.dat
-/usr/share/games/fortunes/platitudes
-/usr/share/games/fortunes/platitudes.dat
-/usr/share/games/fortunes/politics
-/usr/share/games/fortunes/politics.dat
-/usr/share/games/fortunes/riddles
-/usr/share/games/fortunes/riddles.dat
-/usr/share/games/fortunes/science
-/usr/share/games/fortunes/science.dat
-/usr/share/games/fortunes/songs-poems
-/usr/share/games/fortunes/songs-poems.dat
-/usr/share/games/fortunes/sports
-/usr/share/games/fortunes/sports.dat
-/usr/share/games/fortunes/startrek
-/usr/share/games/fortunes/startrek.dat
-/usr/share/games/fortunes/translate-me
-/usr/share/games/fortunes/translate-me.dat
-/usr/share/games/fortunes/wisdom
-/usr/share/games/fortunes/wisdom.dat
-/usr/share/games/fortunes/work
-/usr/share/games/fortunes/work.dat
-/usr/share/games/fortunes/zippy
-/usr/share/games/fortunes/zippy.dat
-#%dir /usr/share/games/fortunes/off
-#/usr/share/games/fortunes/off/*
-/usr/man/man6/fortune.6.bz2
-/usr/man/man1/strfile.1.bz2
-/usr/man/man1/unstr.1.bz2
+%attr(755,root,root)%{_sbindir}/strfile
+%attr(755,root,root)%{_sbindir}/unstr
+%attr(755,root,root)%{_bindir}/rot
+%lang(cs) %{_datadir}/games/fortunes/cs
+%lang(es) %{_datadir}/games/fortunes/es
+%lang(fr) %{_datadir}/games/fortunes/fr
+%lang(ga) %{_datadir}/games/fortunes/ga
+%lang(hu) %{_datadir}/games/fortunes/hu
+%lang(id) %{_datadir}/games/fortunes/id
+%lang(it) %{_datadir}/games/fortunes/it
+%lang(ja) %{_datadir}/games/fortunes/ja
+%lang(wa) %{_datadir}/games/fortunes/wa
+
+%dir %{_datadir}/games/fortunes
+%{_datadir}/games/fortunes/MS-FORTUNES
+%{_datadir}/games/fortunes/MS-FORTUNES.dat
+%{_datadir}/games/fortunes/art
+%{_datadir}/games/fortunes/art.dat
+%{_datadir}/games/fortunes/ascii-art
+%{_datadir}/games/fortunes/ascii-art.dat
+%{_datadir}/games/fortunes/computers
+%{_datadir}/games/fortunes/computers.dat
+%{_datadir}/games/fortunes/cookie
+%{_datadir}/games/fortunes/cookie.dat
+%{_datadir}/games/fortunes/definitions
+%{_datadir}/games/fortunes/definitions.dat
+%{_datadir}/games/fortunes/drugs
+%{_datadir}/games/fortunes/drugs.dat
+%{_datadir}/games/fortunes/education
+%{_datadir}/games/fortunes/education.dat
+%{_datadir}/games/fortunes/ethnic
+%{_datadir}/games/fortunes/ethnic.dat
+%{_datadir}/games/fortunes/food
+%{_datadir}/games/fortunes/food.dat
+%{_datadir}/games/fortunes/fortunes
+%{_datadir}/games/fortunes/fortunes.dat
+%{_datadir}/games/fortunes/goedel
+%{_datadir}/games/fortunes/goedel.dat
+%{_datadir}/games/fortunes/humorists
+%{_datadir}/games/fortunes/humorists.dat
+%{_datadir}/games/fortunes/kids
+%{_datadir}/games/fortunes/kids.dat
+%{_datadir}/games/fortunes/law
+%{_datadir}/games/fortunes/law.dat
+%{_datadir}/games/fortunes/linuxcookie
+%{_datadir}/games/fortunes/linuxcookie.dat
+%{_datadir}/games/fortunes/literature
+%{_datadir}/games/fortunes/literature.dat
+%{_datadir}/games/fortunes/love
+%{_datadir}/games/fortunes/love.dat
+%{_datadir}/games/fortunes/magic
+%{_datadir}/games/fortunes/magic.dat
+%{_datadir}/games/fortunes/medicine
+%{_datadir}/games/fortunes/medicine.dat
+%{_datadir}/games/fortunes/men-women
+%{_datadir}/games/fortunes/men-women.dat
+%{_datadir}/games/fortunes/miscellaneous
+%{_datadir}/games/fortunes/miscellaneous.dat
+%{_datadir}/games/fortunes/news
+%{_datadir}/games/fortunes/news.dat
+%{_datadir}/games/fortunes/people
+%{_datadir}/games/fortunes/people.dat
+%{_datadir}/games/fortunes/pets
+%{_datadir}/games/fortunes/pets.dat
+%{_datadir}/games/fortunes/platitudes
+%{_datadir}/games/fortunes/platitudes.dat
+%{_datadir}/games/fortunes/politics
+%{_datadir}/games/fortunes/politics.dat
+%{_datadir}/games/fortunes/riddles
+%{_datadir}/games/fortunes/riddles.dat
+%{_datadir}/games/fortunes/science
+%{_datadir}/games/fortunes/science.dat
+%{_datadir}/games/fortunes/songs-poems
+%{_datadir}/games/fortunes/songs-poems.dat
+%{_datadir}/games/fortunes/sports
+%{_datadir}/games/fortunes/sports.dat
+%{_datadir}/games/fortunes/startrek
+%{_datadir}/games/fortunes/startrek.dat
+%{_datadir}/games/fortunes/translate-me
+%{_datadir}/games/fortunes/translate-me.dat
+%{_datadir}/games/fortunes/wisdom
+%{_datadir}/games/fortunes/wisdom.dat
+%{_datadir}/games/fortunes/work
+%{_datadir}/games/fortunes/work.dat
+%{_datadir}/games/fortunes/zippy
+%{_datadir}/games/fortunes/zippy.dat
+#%dir %{_datadir}/games/fortunes/off
+#%{_datadir}/games/fortunes/off/*
+%{_mandir}/man6/fortune.6.bz2
+%{_mandir}/man1/strfile.1.bz2
+%{_mandir}/man1/unstr.1.bz2
%changelog
+* Sun Aug 06 2000 Stefan van der Eijk <[EMAIL PROTECTED]> 1.0-28mdk
+- macroszifications
+- BM
+
* Thu Apr 20 2000 Guillaume Cottenceau <[EMAIL PROTECTED]> 1.0-27mdk
- fixed group
--- gated.spec.orig Sun Aug 6 16:08:03 2000
+++ gated.spec Sun Aug 6 16:12:32 2000
@@ -1,7 +1,7 @@
Summary: The GateD routing daemon.
Name: gated
Version: 3.5.11
-Release: 3mdk
+Release: 4mdk
Copyright: distributable
Group: System/Servers
Source0: ftp://ftp.gated.org/net-research/gated/gated-%{version}.tar.bz2
@@ -17,7 +17,7 @@
Patch6: gated-3.5.10-ospfmonauth.patch.bz2
Patch7: gated-3.5.10-vaarg.patch.bz2
-Buildroot: /var/tmp/%{name}-root
+Buildroot: %{_tmppath}/%{name}-buildroot
Prereq: /sbin/chkconfig
Url: http://www.gated.org/
@@ -57,20 +57,23 @@
%install
rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/{usr/{sbin,bin,man/man8},etc/rc.d/init.d}
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8
+mkdir -p $RPM_BUILD_ROOT%{_sbindir}
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
+
+%makeinstall \
+ -C src \
+ BINDIR=$RPM_BUILD_ROOT%{_bindir} \
+ SBINDIR=$RPM_BUILD_ROOT%{_sbindir}
-make -C src \
- BINDIR=$RPM_BUILD_ROOT/usr/bin \
- SBINDIR=$RPM_BUILD_ROOT/usr/sbin \
- install
-
-make MANDIR=$RPM_BUILD_ROOT/usr/man install-man
+make MANDIR=$RPM_BUILD_ROOT%{_mandir} install-man
install -m 0755 -d $RPM_BUILD_ROOT/var/gated
-install -m 0755 %SOURCE1 $RPM_BUILD_ROOT/etc/rc.d/init.d/gated
-install -m 0644 %SOURCE3 $RPM_BUILD_ROOT/etc/gated.conf.sample
+install -m 0755 %SOURCE1 $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/gated
+install -m 0644 %SOURCE3 $RPM_BUILD_ROOT%{_sysconfdir}/gated.conf.sample
# this should not be nessesary, but it is :-(
-install -m 0755 src/obj.`src/util/archtype`/gdc $RPM_BUILD_ROOT/usr/bin/gdc
+install -m 0755 src/obj.`src/util/archtype`/gdc $RPM_BUILD_ROOT%{_bindir}/gdc
%post
/sbin/ldconfig
@@ -83,9 +86,9 @@
%files
%defattr(-,root,root)
-/usr/sbin/gated
-%attr(755,root,root) /usr/bin/*
-/usr/man/man8/*
+%{_sbindir}/gated
+%attr(755,root,root) %{_bindir}/*
+%{_mandir}/man8/*
/var/gated
%doc Acknowledgements BUGS CHANGES CHANGES.1
@@ -94,13 +97,17 @@
%doc conf doc src/configs/linux-README
%doc man/gated-2.0-impl.txt
-%config /etc/rc.d/init.d/gated
-%config /etc/gated.conf.sample
+%config %{_sysconfdir}/rc.d/init.d/gated
+%config %{_sysconfdir}/gated.conf.sample
%clean
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Aug 06 2000 Stefan van der Eijk <[EMAIL PROTECTED]> 3.5.11-4mdk
+- macroszifications
+- BM
+
* Fri May 26 2000 Adam Lebsack <[EMAIL PROTECTED]> 3.5.11-3mdk
- ppc va_arg patch
--- gawk.spec.orig Sun Aug 6 16:18:33 2000
+++ gawk.spec Sun Aug 6 16:22:11 2000
@@ -1,7 +1,7 @@
Summary: The GNU version of the awk text processing utility.
Name: gawk
Version: 3.0.5
-Release: 1mdk
+Release: 2mdk
Copyright: GPL
Group: Text tools
Source0: ftp://prep.ai.mit.edu/pub/gnu/%{name}-%{version}.tar.bz2
@@ -35,43 +35,42 @@
is almost completely compliant with the 1993 POSIX 1003.2 standard for
awk.
-
%prep
%setup -q -b 1
%patch -p1
%build
%configure
-make
+%make
%install
rm -rf $RPM_BUILD_ROOT
%makeinstall bindir=$RPM_BUILD_ROOT/bin
-rm -f $RPM_BUILD_ROOT/usr/share/info/dir
-mkdir -p $RPM_BUILD_ROOT/usr/bin
-cd $RPM_BUILD_ROOT/usr/share
+rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+cd $RPM_BUILD_ROOT%{_datadir}
mkdir awk &&
for i in *.awk;do
mv -f $i awk
done
-cd $RPM_BUILD_ROOT/usr/share/man/
+cd $RPM_BUILD_ROOT%{_mandir}
mkdir -p man1
for i in *;do
mv -f $i man1 || true
done
cd man1
ln -sf gawk.1.bz2 awk.1.bz2
-cd $RPM_BUILD_ROOT/usr/bin
-ln -sf ../../bin/awk $RPM_BUILD_ROOT/usr/bin/awk
-ln -sf ../../bin/gawk $RPM_BUILD_ROOT/usr/bin/gawk
+cd $RPM_BUILD_ROOT%{_bindir}
+ln -sf ../../bin/awk $RPM_BUILD_ROOT%{_bindir}/awk
+ln -sf ../../bin/gawk $RPM_BUILD_ROOT%{_bindir}/gawk
%post
-/sbin/install-info /usr/share/info/gawk.info.bz2 /usr/share/info/dir
+/sbin/install-info %{_infodir}/gawk.info.bz2 %{_infodir}/dir
%preun
if [ $1 = 0 ]; then
- /sbin/install-info --delete /usr/share/info/gawk.info.bz2 /usr/share/info/dir
+ /sbin/install-info --delete %{_infodir}/gawk.info.bz2 %{_infodir}/dir
fi
%clean
@@ -92,6 +91,10 @@
%doc README_d POSIX.STD doc/gawk.ps doc/awkcard.ps
%changelog
+* Sun Aug 06 2000 Stefan van der Eijk <[EMAIL PROTECTED]> 3.0.5-2mdk
+- some more macroszifications
+- BM
+
* Sat Jul 22 2000 Geoffrey Lee <[EMAIL PROTECTED]> 3.0.5-1mdk
- new version
- macros
--- gdbm.spec.orig Sun Aug 6 16:42:46 2000
+++ gdbm.spec Sun Aug 6 17:10:21 2000
@@ -1,14 +1,14 @@
Summary: A GNU set of database routines which use extensible hashing.
Name: gdbm
Version: 1.8.0
-Release: 6mdk
+Release: 7mdk
Source: ftp://ftp.gnu.org/pub/gnu/gdbm-%{version}.tar.bz2
Patch0: gdbm-1.8.0-jbj.patch.bz2
Patch1: gdbm-1.8.0-asnonroot.patch.bz2
Copyright: GPL
Group: System/Libraries
Prefix: %{_prefix}
-Buildroot: %{_tmppath}/gdbm-root
+Buildroot: %{_tmppath}/%{name}-root
%description
Gdbm is a GNU database indexing library, including routines
@@ -43,51 +43,57 @@
# XXX --includedir dinna work
%configure
-make includedir=%{_prefix}/include/gdbm
+%make includedir=%{_includedir}/gdbm
%install
rm -rf $RPM_BUILD_ROOT
# XXX --includedir dinna work
-make install install-compat \
- prefix=${RPM_BUILD_ROOT}%{_prefix} \
- includedir=${RPM_BUILD_ROOT}%{_prefix}/include/gdbm
+%makeinstall \
+ install-compat \
+ man3dir=$RPM_BUILD_ROOT%{_mandir}/man3 \
+ prefix=${RPM_BUILD_ROOT}%{_prefix} \
+ includedir=${RPM_BUILD_ROOT}%{_includedir}/gdbm
( cd $RPM_BUILD_ROOT
- ln -sf gdbm/gdbm.h .%{_prefix}/include/gdbm.h
- ln -sf libgdbm.so.2.0.0 .%{_prefix}/lib/libgdbm.so.2
- ln -sf libgdbm.so.2 .%{_prefix}/lib/libgdbm.so
+ ln -sf gdbm/gdbm.h .%{_includedir}/gdbm.h
+ ln -sf libgdbm.so.2.0.0 .%{_libdir}/libgdbm.so.2
+ ln -sf libgdbm.so.2 .%{_libdir}/libgdbm.so
)
%post -p /sbin/ldconfig
%post devel
-/sbin/install-info /usr/info/gdbm.info.bz2 /usr/info/dir --entry="* gdbm: (gdbm).
The GNU Database."
+/sbin/install-info %{_infodir}/gdbm.info.bz2 %{_infodir}/dir --entry="* gdbm: (gdbm).
+ The GNU Database."
%postun -p /sbin/ldconfig
%preun devel
if [ $1 = 0 ]; then
- /sbin/install-info --delete /usr/info/gdbm.info.bz2 /usr/info/dir --entry="* gdbm:
(gdbm). The GNU Database."
+ /sbin/install-info --delete %{_infodir}/gdbm.info.bz2 %{_infodir}/dir --entry="*
+gdbm: (gdbm). The GNU Database."
fi
%files
%defattr(-,root,root)
-/usr/lib/libgdbm.so.*
+%{_libdir}/libgdbm.so.*
%files devel
%defattr(-,root,root)
-%{_prefix}/lib/libgdbm.so
-%{_prefix}/lib/libgdbm.la
-%{_prefix}/lib/libgdbm.a
-%{_prefix}/include/*
-%{_prefix}/info/gdbm*
-%{_prefix}/man/man3/*
+%{_libdir}/libgdbm.so
+%{_libdir}/libgdbm.la
+%{_libdir}/libgdbm.a
+%{_includedir}/*
+%{_infodir}/gdbm*
+%{_mandir}/man3/*
%clean
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Aug 06 2000 Stefan van der Eijk <[EMAIL PROTECTED]> 1.8.0-7mdk
+- some more macroszifications
+- BM
+
* Wed May 24 2000 Chmouel Boudjnah <[EMAIL PROTECTED]> 1.8.0-6mdk
- Use tmpppath macros.
