-------- Original Message --------
Subject: some odd fixes (maintainers: please read this)
Date: Sat, 15 Jul 2000 21:44:15 +0200
From: Stefan van der Eijk <[EMAIL PROTECTED]>
To: Cooker <[EMAIL PROTECTED]>
I've updated the following packages:
GXedit-1.23-4mdk.src.rpm
devfsd-1.3.10-2mdk.src.rpm
dosfstools-2.4-2mdk.src.rpm
libtool-1.3.5-2mdk.src.rpm
vixie-cron-3.0.1-43mdk.src.rpm
The packages have been uploaded to the /incoming
directory. Please evaluate them, and if possible
merge with cooker.
Thanks,
Stefan
--- devfsd.spec.orig Sat Jul 15 17:36:32 2000
+++ devfsd.spec Sat Jul 15 17:43:34 2000
@@ -4,7 +4,7 @@
Name: devfsd
Exclusiveos: Linux
Version: 1.3.10
-Release: 1mdk
+Release: 2mdk
Copyright: GPL
URL: ftp://ftp.atnf.csiro.au/pub/people/rgooch/linux/%{name}-v%{version}.tar.bz2
Group: System/Kernel and hardware
@@ -57,7 +57,7 @@
%install
mkdir -p %{buildroot}/{sbin,%{_sysconfdir},/%{_mandir}/man8,etc}
install -m 755 -s devfsd %{buildroot}/sbin/devfsd
-install -m 644 devfsd.8.bz2 %{buildroot}/%{_mandir}/man8
+install -m 644 devfsd.8 %{buildroot}/%{_mandir}/man8
install -m 644 devfsd.conf %{buildroot}%{_sysconfdir}
install -m 644 modules.devfs %{buildroot}%{_sysconfdir}
@@ -75,6 +75,10 @@
%config %{_sysconfdir}/modules.devfs
%changelog
+* Sat Jul 15 2000 Stefan van der Eijk <[EMAIL PROTECTED]> 1.3.10-2mdk
+- changed devfsd.8.bz2 into devfsd.8 --> man pages aren't compressed yet
+ when they are moved to the $RPM_BUILD_ROOT. Come on... don't we test this
+ stuff anymore??
* Tue Jul 04 2000 Thierry Vignaud <[EMAIL PROTECTED]> 1.3.10-1mdk
- new release (argh ... why do he fix in a new release what i've just fixed
--- dosfstools.spec.orig Sat Jul 15 21:06:20 2000
+++ dosfstools.spec Sat Jul 15 21:33:36 2000
@@ -1,6 +1,6 @@
# dosfstools.spec
%define version 2.4
-%define release 1mdk
+%define release 2mdk
Summary: Utilities to create and check MS-DOS FAT filesystems.
Name: dosfstools
@@ -22,6 +22,12 @@
code.
%changelog
+* Sat Jul 15 2000 Stefan van der Eijk <[EMAIL PROTECTED]> 2.4-2mdk
+- makeinstall macro
+- macroszifications
+- fixed compressing manpages (keeping the crazy simlinks)
+- added %clean
+
* Fri Mar 31 2000 Fran�ois Pons <[EMAIL PROTECTED]> 2.4-1mdk
- updated Group.
- 2.4.
@@ -86,13 +92,15 @@
rm -rf $RPM_BUILD_ROOT
cp dosfsck/README README.fsck
cp mkdosfs/README README.mkdosfs
-make install PREFIX="$RPM_BUILD_ROOT"
- cd $RPM_BUILD_ROOT/usr/man/man8/
+%makeinstall PREFIX="$RPM_BUILD_ROOT"
+ cd $RPM_BUILD_ROOT%{_mandir}/man8/
for i in $(find . -type 'l');do
TO=$(/bin/ls -l $i|awk '{print $NF}')
ln -sf $TO.bz2 $i.bz2
done
- bzip2 -9f *.8
+
+ find -type f -exec bzip2 -9f {} \;
+ rm -rf *.8
for i in `find $RPM_BUILD_ROOT/ -type 'f' -perm '+a=x' ! -name 'lib*so*'`;do
file $i|grep -q "not stripped" && strip $i
@@ -104,10 +112,13 @@
cd $RPM_BUILD_ROOT/sbin
rm -f fsck*
+%clean
+rm -r $RPM_BUILD_ROOT
+
%files
%defattr(-,root,root)
%doc CHANGES TODO README.fsck README.mkdosfs dosfsck/COPYING
/sbin/*
-/usr/man/man8/*.bz2
+%{_mandir}/man8/*.bz2
# end of file
--- gxedit.spec.orig Sat Jul 15 17:45:32 2000
+++ gxedit.spec Sat Jul 15 19:33:57 2000
@@ -1,6 +1,6 @@
%define name GXedit
%define version 1.23
-%define release 3mdk
+%define release 4mdk
%define prefix /usr
Summary: A multi-function text editor using GTK+
@@ -20,6 +20,11 @@
Buildroot: /var/tmp/%{name}-%{version}-%{release}-root
%changelog
+* Sat Jul 15 2000 Stefan van der Eijk <[EMAIL PROTECTED]> 1.23-4mdk
+- do stripping of binaries by hand, the statement in 1.23-3mdk attemted
+ to strip .sh files, which caused the package to stop building
+- %makeinstall
+
* Sat Mar 25 2000 Daouda Lo <[EMAIL PROTECTED]> 1.23-3mdk
- change group
@@ -64,13 +69,16 @@
%install
if [ -d $RPM_BUILD_ROOT ]; then rm -r $RPM_BUILD_ROOT; fi
mkdir -p $RPM_BUILD_ROOT%{prefix}/bin
-make SHARE=$RPM_BUILD_ROOT%{prefix}/share INSTALL_DIR=$RPM_BUILD_ROOT%{prefix}/bin/
install
+%makeinstall SHARE=$RPM_BUILD_ROOT%{prefix}/share
+INSTALL_DIR=$RPM_BUILD_ROOT%{prefix}/bin/
mkdir -p $RPM_BUILD_ROOT%{prefix}/share/gnome/apps/Applications
install -c -m 664 %{SOURCE1} $RPM_BUILD_ROOT%{prefix}/share/gnome/apps/Applications
# strip binaries
-strip `file $RPM_BUILD_ROOT/%{prefix}/bin/* | awk -F':' '/executable/ { print $1 }'`
+#strip `file $RPM_BUILD_ROOT/%{prefix}/bin/* | awk -F':' '/executable/ { print $1 }'`
+strip $RPM_BUILD_ROOT/%{prefix}/bin/gtk-shell
+strip $RPM_BUILD_ROOT/%{prefix}/bin/gxedit
+strip $RPM_BUILD_ROOT/%{prefix}/bin/xproc
%files
--- libtool.spec.org Mon Jun 26 09:49:13 2000
+++ libtool.spec Sat Jul 15 17:17:27 2000
@@ -1,6 +1,6 @@
%define name libtool
%define version 1.3.5
-%define release 1mdk
+%define release 2mdk
Summary: The GNU libtool, which simplifies the use of shared libraries.
Name: %{name}
@@ -9,8 +9,7 @@
Copyright: GPL
Group: Development/Other
Source: ftp://ftp.gnu.org/gnu/libtool/libtool-%{version}.tar.bz2
-Patch0: libtool-mandrakehack.patch.bz2
-Patch1: libtool-1.2f-cache.patch.bz2
+Patch0: libtool-1.2f-cache.patch.bz2
Prefix: %{_prefix}
URL: http://www.gnu.org/software/libtool/libtool.html
PreReq: /sbin/install-info
@@ -36,7 +35,7 @@
%prep
%setup -q
-%patch1 -p1
+%patch0 -p1
%build
%configure
@@ -47,10 +46,6 @@
rm -rf $RPM_BUILD_ROOT
%makeinstall
-# i suck --Geoff
-cd $RPM_BUILD_ROOT/%{prefix}/share/libtool
-bzip2 -dc %{PATCH0} | patch -p0
-
cd $RPM_BUILD_ROOT
rm -f .%{prefix}/share/libtool/libltdl/stamp-h.in
mv .%{prefix}/share/libtool/libltdl .%{prefix}/share/libtool/libltdl-X
@@ -87,6 +82,9 @@
%{prefix}/lib/*.so
%changelog
+* Sat Jul 15 2000 Stefan van der Eijk <[EMAIL PROTECTED]> 1.3.5-2mdk
+- removed libtool-mandrakehack.patch
+
* Wed Jun 21 2000 Geoffrey Lee <[EMAIL PROTECTED]> 1.3.5-1mdk
- picks up $arch-mandrake-linux-gnu not $arch-pc-linux-gnu (patch)
well, for x86 and alpha anyway, maybe ultrasparc too ??
--- vixie-cron.spec.orig Sat Jul 15 17:23:00 2000
+++ vixie-cron.spec Sat Jul 15 17:29:09 2000
@@ -1,7 +1,7 @@
Summary: The Vixie cron daemon for executing specified programs at set times.
Name: vixie-cron
Version: 3.0.1
-Release: 42mdk
+Release: 43mdk
Copyright: distributable
Group: System/Servers
Source0: ftp://ftp.vix.com/pub/vixie/vixie-cron-3.0.1.tar.bz2
@@ -71,10 +71,7 @@
mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
install -m644 $RPM_SOURCE_DIR/cron.log $RPM_BUILD_ROOT/etc/logrotate.d/cron
-
-for i in 1 5 8;do
-bzip2 -9f $RPM_BUILD_ROOT/usr/man/man$i/*
-done
+find $RPM_BUILD_ROOT/usr/man/ -type f -exec bzip2 -9f {} \;
(
cd $RPM_BUILD_ROOT/usr/man/man8/
@@ -120,6 +117,9 @@
%config /etc/logrotate.d/cron
%changelog
+* Sat Jul 15 2000 Stefan van der Eijk <[EMAIL PROTECTED]> 3.0.1-43mdk
+- changed way manpages are compressed, use find instead of for
+
* Mon Apr 10 2000 Christopher Molnar <[EMAIL PROTECTED]> 3.0.1-42mdk
- Fixed group
