rpms/mikmod/FC-5 mikmod.spec, 1.30, 1.31 sources, 1.3, 1.4 mikmod-3.1.6-security.patch, 1.1, NONE mikmod-3.1.6-tar.patch, 1.1, NONE mikmod-3.1.6-varargs.patch, 1.1, NONE mikmod-strip.patch, 1.1, NONE patch-mikmod-3.1.6-a, 1.1, NONE

Tue May 29 08:50:11 UTC 2007

Author: jnovy

Update of /cvs/dist/rpms/mikmod/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv8176

Modified Files:
	mikmod.spec sources 
Removed Files:
	mikmod-3.1.6-security.patch mikmod-3.1.6-tar.patch 
	mikmod-3.1.6-varargs.patch mikmod-strip.patch 
	patch-mikmod-3.1.6-a 
Log Message:
- update to mikmod-3.2.2-beta1
- don't use undefined macros, spec fixes
- fix install-info scriptlet usage (#223711), thanks to Ville Skytta



Index: mikmod.spec
===================================================================
RCS file: /cvs/dist/rpms/mikmod/FC-5/mikmod.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31

--- mikmod.spec	9 Nov 2006 16:03:11 -0000	1.30
+++ mikmod.spec	29 May 2007 08:50:08 -0000	1.31
@@ -1,28 +1,21 @@
-# libmikmod rpm specification file
 %define lversion 3.1.11
 
-Summary: A MOD music file player.
+Summary: A MOD music file player
 Name: mikmod
-Version: 3.1.6
-Release: 37%{?dist}
+Version: 3.2.2
+Release: 1%{?dist}
 License: GPL/LGPL
 Group: Applications/Multimedia
-Prereq: /sbin/ldconfig
-Prefix: /usr
-Buildroot: %{_tmppath}/%{name}-%{version}-root
-BuildPrereq: ncurses-devel texinfo
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: ncurses-devel texinfo
 URL: http://mikmod.raphnet.net/
-Source0: http://mikmod.raphnet.net/files/mikmod-%{version}.tar.gz
+Source0: http://mikmod.raphnet.net/files/mikmod-%{version}-beta1.tar.gz
 Source1: http://mikmod.raphnet.net/files/libmikmod-%{lversion}.tar.gz
 Patch0:  http://mikmod.raphnet.net/files/libmikmod-3.1.11-a.diff
-Patch1:  mikmod-strip.patch
-Patch2:  libmikmod-esd.patch
-Patch3:  libmikmod-64bit.patch
-Patch4:  patch-mikmod-3.1.6-a
-Patch5:  mikmod-3.1.6-varargs.patch
-Patch6:  libmikmod-strip-lib.patch
-Patch7:  mikmod-3.1.6-security.patch
-Patch8:  mikmod-3.1.6-tar.patch
+Patch1:  libmikmod-esd.patch
+Patch2:  libmikmod-64bit.patch
+Patch3:  libmikmod-strip-lib.patch
+Patch4:  mikmod-3.1.6-multilib.patch
 
 %description
 MikMod is one of the best and most well known MOD music file players
@@ -47,55 +40,48 @@
 applications for mikmod.
 
 %prep
-%setup -q -a 1 
+%setup -q -a 1 -n %{name}-%{version}-beta1
 %patch0 -p0
-%patch1 -p1 -b .strip
-%patch2 -p1 -b .esd
-%patch3 -p1
-%patch4 -p1 -b .orig
-%patch5 -p1 
-%patch6 -p1 -b .lib-strip
-%patch7 -p1 -b .sec
-%patch8 -p1 -b .tar
+%patch1 -p1 -b .esd
+%patch2 -p1 -b .64bit
+%patch3 -p1 -b .lib-strip
+%patch4 -p1 -b .multi
 
 %build
 rm -rf $RPM_BUILD_ROOT
-cd libmikmod-%{lversion}
-cp /usr/share/libtool/config.{sub,guess} .
+pushd libmikmod-%{lversion}
 %configure
-make
-%makeinstall
-cd ..
+make install DESTDIR=$RPM_BUILD_ROOT
+popd
 
 # Trick it into compiling while libmikmod is not installed...
-export LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{prefix}/lib:$LD_LIBRARY_PATH
-perl -pi -e "s,-lmikmod,-I$RPM_BUILD_ROOT%{prefix}/include -L$RPM_BUILD_ROOT%{_libdir} -lmikmod,g" libmikmod-%{lversion}/libmikmod-config
+export LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{_libdir}:$LD_LIBRARY_PATH
+perl -pi -e "s,-lmikmod,-I$RPM_BUILD_ROOT%{_prefix}/include -L$RPM_BUILD_ROOT%{_libdir} -lmikmod,g" libmikmod-%{lversion}/libmikmod-config
 export LIBMIKMOD_CONFIG=`pwd`/libmikmod-%{lversion}/libmikmod-config
-cp /usr/share/libtool/config.{sub,guess} .
 %configure \
-	--with-libmikmod-prefix=$RPM_BUILD_ROOT%{prefix} \
-	--with-libmikmod-exec-prefix=$RPM_BUILD_ROOT%{prefix}/bin \
+	--with-libmikmod-prefix=$RPM_BUILD_ROOT%{_prefix} \
+	--with-libmikmod-exec-prefix=$RPM_BUILD_ROOT%{_bindir} \
 	--disable-libmikmodtest
-make CFLAGS="$RPM_OPT_FLAGS `libmikmod-%{lversion}/libmikmod-config --cflags` -I."
+make CFLAGS="$RPM_OPT_FLAGS `libmikmod-%{lversion}/libmikmod-config --cflags`"
 
 %install
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 find $RPM_BUILD_ROOT | grep "\\.la$" | xargs rm -f
 
 %clean
-rm -fr $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %post -p /sbin/ldconfig
 
 %post devel
-/sbin/install-info %{_infodir}/mikmod.info.gz %{_infodir}/dir
+/sbin/install-info %{_infodir}/mikmod.info.gz %{_infodir}/dir || :
 
 %postun -p /sbin/ldconfig
 
 %postun devel
 if [ $1 = 0 ] ; then
-	/sbin/install-info  --delete %{_infodir}/mikmod.info.gz %{_infodir}/dir
+	/sbin/install-info  --delete %{_infodir}/mikmod.info.gz %{_infodir}/dir || :
 fi
 
 %files
@@ -104,19 +90,25 @@
 %doc libmikmod-%{lversion}/TODO
 %{_bindir}/mikmod
 %{_mandir}/man1/mikmod*
-%{_libdir}/*.so*
+%{_libdir}/*.so.*
 
 %files devel
 %defattr(-, root, root)
 %{_bindir}/*-config
 %{_libdir}/*.a
-#%{_libdir}/*.la
+%{_libdir}/*.so
 %{_datadir}/aclocal/*
+%{_datadir}/mikmod/mikmodrc
 %{_includedir}/*
 %{_infodir}/mikmod*
 %{_mandir}/man1/libmikmod-config*
 
 %changelog
+* Mon May 28 2007 Jindrich Novy <jnovy at redhat.com> 3.2.2-1
+- update to mikmod-3.2.2-beta1
+- don't use undefined macros, spec fixes
+- fix install-info scriptlet usage (#223711), thanks to Ville Skytta
+
 * Wed Nov  9 2006 Martin Stransky <stransky at redhat.com> 3.1.6-37
 - removed obsoletes on tracker (#214112)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mikmod/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Sep 2004 08:32:55 -0000	1.3
+++ sources	29 May 2007 08:50:08 -0000	1.4
@@ -1,2 +1,2 @@
+9a9534a054afe8d28cc784041e6d1519  mikmod-3.2.2-beta1.tar.gz
 705106da305e8de191549f1e7393185c  libmikmod-3.1.11.tar.gz
-71d8142ae3ae27034535913e906b1384  mikmod-3.1.6.tar.gz


--- mikmod-3.1.6-security.patch DELETED ---


--- mikmod-3.1.6-tar.patch DELETED ---


--- mikmod-3.1.6-varargs.patch DELETED ---


--- mikmod-strip.patch DELETED ---


--- patch-mikmod-3.1.6-a DELETED ---


