Hi,
gfcc-0.7.4-4mdk.src.rpm
gmp-2.0.2-14mdk.src.rpm
have been uploaded to /incoming. I've fixed
the makeinstall issues. Please merge with cooker
if possible...
The list of makeinstall affected packages
is becoming smaller... If you're looking for
a challenge, try fixing these packages (on
a very recent cooker system --> latest rpm
installed).
Stefan
./cfengine-1.5.4-2mdk.src.rpm
./fileutils-4.0-9mdk.src.rpm
./gawk-3.0.4-3mdk.src.rpm
./gdb-5.0-2mdk.src.rpm
./gimp-data-extras-1.0.0-9mdk.src.rpm
./grep-2.4.2-1mdk.src.rpm
./groff-1.15-4mdk.src.rpm
./icewm-1.0.4-1mdk.src.rpm
./lftp-2.2.3-1mdk.src.rpm
./libmikmod-3.1.9-1mdk.src.rpm
./libsigc++-1.0.1-1mdk.src.rpm
./pilot-link-0.9.3-11mdk.src.rpm
./stylesheets-0.10-3mdk.src.rpm
./libtool/diffutils-2.7-18mdk.src.rpm
./libtool/ed-0.2-18mdk.src.rpm
./libtool/flex-2.5.4a-12mdk.src.rpm
./libtool/rcs-5.7-3mdk.src.rpm
./libtool/tcltk-8.0.5-20mdk.src.rpm
--- gfcc.spec.orig Wed Jul 12 22:17:49 2000
+++ gfcc.spec Wed Jul 12 22:19:51 2000
@@ -1,6 +1,6 @@
%define name gfcc
%define version 0.7.4
-%define release 3mdk
+%define release 4mdk
Name: %{name}
Version: %{version}
@@ -25,22 +25,21 @@
%build
( tar xvfz libipfwc.tar.gz; cd libipfwc; make CFLAGS="$RPM_OPT_FLAGS")
-%configure --with-ipfwc=./libipfwc --datadir=%{prefix}/share
+%configure --with-ipfwc=./libipfwc --datadir=%{_datadir}
make
%install
rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{prefix}/bin
-mkdir -p $RPM_BUILD_ROOT%{prefix}/share/gfcc/rules
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/gfcc/rules
-make prefix=$RPM_BUILD_ROOT%{prefix} datadir=$RPM_BUILD_ROOT%{prefix}/share \
- install
+%makeinstall
# Menu
-mkdir -p $RPM_BUILD_ROOT/usr/lib/menu
-cat >$RPM_BUILD_ROOT/usr/lib/menu/gfcc <<EOF
-?package(gfcc): command="/usr/bin/gfcc" needs="X11" \
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/menu
+cat >$RPM_BUILD_ROOT%{_libdir}/menu/gfcc <<EOF
+?package(gfcc): command="%{_bindir}/gfcc" needs="X11" \
icon="none" section="Configuration/Networking" \
title="gfcc" longtitle="GTK+ Firewall Control Center"
EOF
@@ -50,21 +49,25 @@
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)
%doc AUTHORS COPYING ChangeLog INSTALL NEWS README README.ko TODO texinfo.tex
-%{prefix}/bin/*
-%{prefix}/share/gfcc/*
-/usr/lib/menu/gfcc
+%{_bindir}/*
+%{_datadir}/gfcc/*
+%{_libdir}/menu/gfcc
%changelog
+* Wed Jul 12 2000 Stefan van der Eijk <[EMAIL PROTECTED]> 0.7.4-4mdk
+- makeinstall macro
+- macroszifications
+
* Thu Apr 06 2000 John Buswell <[EMAIL PROTECTED]> 0.7.4-3mdk
- fixed prefix
- fixed menu entry
--- gmp.spec.orig Thu Jul 13 06:24:08 2000
+++ gmp.spec Thu Jul 13 06:25:38 2000
@@ -1,7 +1,7 @@
Summary: A GNU arbitrary precision library.
Name: gmp
Version: 2.0.2
-Release: 13mdk
+Release: 14mdk
URL: http://www.gnu.org
Source: ftp://ftp.gnu.org/pub/gnu/gmp-2.0.2.tar.bz2
Patch0: gmp-2.0.2-1.shared.patch.bz2
@@ -54,23 +54,23 @@
%install
[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
-mkdir -p ${RPM_BUILD_ROOT}/usr/lib ${RPM_BUILD_ROOT}/usr/info \
- ${RPM_BUILD_ROOT}/usr/include
+mkdir -p ${RPM_BUILD_ROOT}%{_libdir} ${RPM_BUILD_ROOT}%{_infodir} \
+ ${RPM_BUILD_ROOT}%{_includedir}
-make CFLAGS="${RPM_OPT_FLAGS}" prefix=${RPM_BUILD_ROOT}/usr install
-bzip2 -9f ${RPM_BUILD_ROOT}/usr/info/gmp.info*
-install -m 644 mpn/gmp-mparam.h ${RPM_BUILD_ROOT}/usr/include/
+%makeinstall
+bzip2 -9f ${RPM_BUILD_ROOT}%{_infodir}/gmp.info*
+install -m 644 mpn/gmp-mparam.h ${RPM_BUILD_ROOT}%{_includedir}/
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%post devel
-/sbin/install-info /usr/info/gmp.info.bz2 /usr/info/dir
+/sbin/install-info %{_infodir}/gmp.info.bz2 %{_infodir}/dir
%preun devel
if [ "$1" = 0 ]; then
- /sbin/install-info --delete /usr/info/gmp.info.bz2 /usr/info/dir
+ /sbin/install-info --delete %{_infodir}/gmp.info.bz2 %{_infodir}/dir
fi
%clean
@@ -78,18 +78,22 @@
%files
%defattr(-,root,root)
-/usr/lib/libgmp.so.2.0.2
+%{_libdir}/libgmp.so.2.0.2
%files devel
%defattr(-,root,root)
%doc SPEED NEWS README
-/usr/lib/libgmp.so
-/usr/lib/libgmp.a
-/usr/include/gmp.h
-/usr/include/gmp-mparam.h
-/usr/info/gmp.info*
+%{_libdir}/libgmp.so
+%{_libdir}/libgmp.a
+%{_includedir}/gmp.h
+%{_includedir}/gmp-mparam.h
+%{_infodir}/gmp.info*
%changelog
+* Thu Jul 13 2000 Stefan van der Eijk <[EMAIL PROTECTED]> 2.0.2-14mdk
+- makeinstall macro
+- macroszifications
+
* Sat Mar 25 2000 Daouda Lo <[EMAIL PROTECTED]> 2.0.2-13mdk
- fix group
m.sh
macro.sh
