Hi, Here are some more makeinstall fixes...
I've uploaded the following files to /incoming:
enlightenment-conf-0.15-12mdk.src.rpm
ext2resize-1.0.6-3mdk.src.rpm
fetchmail-5.4.3-3mdk.src.rpm.stefan (somebody else uploaded
fetchmail-5.4.3-3mdk.src.rpm already --> please look into merging the
two)
file-3.31-2mdk.src.rpm
freetype-1.3.1-2mdk.src.rpm
Please look into merging these tiny fixes with cooker...
Thanks!!
Stefan
--- e-conf.spec.orig Sun Jul 9 22:05:06 2000
+++ e-conf.spec Sun Jul 9 22:06:30 2000
@@ -1,6 +1,6 @@
# Note that this is NOT a relocatable package
%define ver 0.15
-%define rel 11mdk
+%define rel 12mdk
%define prefix /usr
Summary: Enlightenment Configuration applet.
@@ -27,6 +27,10 @@
A Configuration tool for easily setting up Enlightenment
%changelog
+* Sun Jul 09 2000 Stefan van der Eijk <[EMAIL PROTECTED]> 0.15-12mdk
+- makeinstall macro
+- macroszifications
+
* Wed Apr 19 2000 Warly <[EMAIL PROTECTED]> 0.15-11mdk
- new group: Graphical desktop/Enlightenment
@@ -89,7 +93,7 @@
%install
rm -rf $RPM_BUILD_ROOT
-make prefix=$RPM_BUILD_ROOT%{prefix} install
+%makeinstall
%clean
rm -rf $RPM_BUILD_ROOT
@@ -102,5 +106,5 @@
%defattr(-, root, root)
%doc AUTHORS COPYING ChangeLog NEWS README
-%{prefix}/bin/*
-%{prefix}/share/locale/*/*/*
+%{_bindir}/*
+%{_datadir}/locale/*/*/*
--- ext2resize.spec.orig Sun Jul 9 22:12:26 2000
+++ ext2resize.spec Sun Jul 9 22:13:44 2000
@@ -3,7 +3,7 @@
Name: ext2resize
%define ver 1.0
Version: %{ver}.6
-Release: 2mdk
+Release: 3mdk
Copyright: GPL
Group: System/Kernel and hardware
Url: http://ext2resize.sourceforge.net/
@@ -37,10 +37,10 @@
%install
rm -rf $RPM_BUILD_ROOT
-make prefix=$RPM_BUILD_ROOT/usr install
+%makeinstall
-install -d $RPM_BUILD_ROOT/usr/man/man8
-install -m 644 doc/*.8 $RPM_BUILD_ROOT/usr/man/man8
+install -d $RPM_BUILD_ROOT%{_mandir}/man8
+install -m 644 doc/*.8 $RPM_BUILD_ROOT%{_mandir}/man8
%clean
rm -rf $RPM_BUILD_ROOT
@@ -48,10 +48,14 @@
%files
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog INSTALL NEWS README
-/usr/sbin/*
-/usr/man/*/*
+%{_sbindir}/*
+%{_mandir}/*/*
%changelog
+* Sun Jul 09 2000 Stefan van der Eijk <[EMAIL PROTECTED]> 1.0.6-3mdk
+- makeinstall macro
+- macroszifications
+
* Sat Mar 25 2000 Pixel <[EMAIL PROTECTED]> 1.0.6-2mdk
- add back patch for giving min size
5c5
< Release: 2mdk
---
> Release: 3mdk
145c145
< mkdir -p $RPM_BUILD_ROOT/{etc/X11/wmconfig,usr/lib/rhs/control-panel}
---
> mkdir -p $RPM_BUILD_ROOT/{etc/X11/wmconfig,%{_libdir}/rhs/control-panel}
147c147
< make prefix=$RPM_BUILD_ROOT%{prefix} install
---
> %makeinstall
149,150c149,151
< cp rh-config/*.{xpm,init} $RPM_BUILD_ROOT/usr/lib/rhs/control-panel
< cp fetchmail.man $RPM_BUILD_ROOT/usr/man/man1/fetchmail.1
---
> cp rh-config/*.{xpm,init} $RPM_BUILD_ROOT%{_libdir}/rhs/control-panel
> mkdir $RPM_BUILD_ROOT%{_mandir}/man1
> cp fetchmail.man $RPM_BUILD_ROOT%{_mandir}/man1/fetchmail.1
156,157c157,158
< mkdir -p $RPM_BUILD_ROOT%{prefix}/lib/menu
< install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{prefix}/lib/menu/fetchmailconf
---
> mkdir -p $RPM_BUILD_ROOT%{_libdir}/menu
> install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/menu/fetchmailconf
159,160c160,161
< mkdir -p $RPM_BUILD_ROOT%{prefix}/share/icons
< install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{prefix}/share/icons/
---
> mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons
> install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/icons/
204c205
< [ -x /usr/bin/update-menus ] && /usr/bin/update-menus || true
---
> [ -x %{_bindir}/update-menus ] && %{_bindir}/update-menus || true
211a213,215
> * Sun Jul 09 2000 Stefan van der Eijk <[EMAIL PROTECTED]> 5.4.3-3mdk
> - makeinstall macro
> - macroszifications
4c4
< Release: 1mdk
---
> Release: 2mdk
7c7
< Source: ftp://ftp.astron.com/pub/file/file-%{version}.tar.bz2
---
> Source: ftp://ftp.astron.com/pub/file/%{name}-%{version}.tar.bz2
24,25c24,26
< rm -f ./Magdir/gimp
< bzcat %SOURCE1 > ./Magdir/gimp
---
> #rm -f ./Magdir/gimp
> # 20000709 %SOURCE1 is not included with package... weird.
> #bzcat %SOURCE1 > ./Magdir/gimp
28c29
< #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr
---
> #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{prefix}
43c44
< make prefix=$RPM_BUILD_ROOT/%{prefix} install
---
> %makeinstall
50,53c51,54
< %{prefix}/bin/file
< %{prefix}/share/magic
< %{prefix}/man/man1/file.1*
< %{prefix}/man/man4/magic.4*
---
> %{_bindir}/file
> %{_datadir}/magic
> %{_mandir}/man1/file.1*
> %{_mandir}/man4/magic.4*
55a57,60
> * Sun Jul 09 2000 Stefan van der Eijk <[EMAIL PROTECTED]> 3.31-2mdk
> - makeinstall macro
> - macroszifications
>
--- freetype.spec.orig Sun Jul 9 22:44:56 2000
+++ freetype.spec Sun Jul 9 22:46:29 2000
@@ -1,5 +1,5 @@
%define ver 1.3.1
-%define rel 1mdk
+%define rel 2mdk
Summary: Free TrueType font rasterizer library.
Name: freetype
@@ -37,14 +37,13 @@
%build
%configure --disable-debug --enable-static --enable-shared \
- --with-locale-dir=/usr/share/locale
+ --with-locale-dir=%{_datadir}/locale
make
make -C ttmkfdir-1.1
%install
rm -rf $RPM_BUILD_ROOT
-make prefix=$RPM_BUILD_ROOT/usr install \
- gnulocaledir=$RPM_BUILD_ROOT/usr/share/locale
+%makeinstall gnulocaledir=$RPM_BUILD_ROOT%{_datadir}/locale
make -C ttmkfdir-1.1 install
%clean
@@ -56,20 +55,24 @@
%files
%defattr(-,root,root,-)
-/usr/bin/*
-/usr/sbin/*
-/usr/lib/libttf.so.*
-/usr/share/locale/*/LC_MESSAGES/*.mo
+%{_bindir}/*
+%{_sbindir}/*
+%{_libdir}/libttf.so.*
+%{_datadir}/locale/*/LC_MESSAGES/*.mo
%doc README announce docs
%files devel
%defattr(-,root,root,-)
-/usr/include/*
-/usr/lib/libttf.so
-/usr/lib/libttf.la
-/usr/lib/libttf.a
+%{_includedir}/*
+%{_libdir}/libttf.so
+%{_libdir}/libttf.la
+%{_libdir}/libttf.a
%changelog
+* Sun Jul 09 2000 Stefan van der Eijk <[EMAIL PROTECTED]> 1.3.1-2mdk
+- makeinstall macro
+- macroszifications
+
* Mon Mar 27 2000 Frederic Lepied <[EMAIL PROTECTED]> 1.3.1-1mdk
- 1.3.1
- group fix.
