rpms/mikmod/devel mikmod.spec, 1.35, 1.36 sources, 1.5, 1.6 libmikmod-3.1.11-a.diff, 1.3, NONE libmikmod-64bit.patch, 1.4, NONE libmikmod-esd.patch, 1.4, NONE libmikmod-strip-lib.patch, 1.4, NONE mikmod-3.1.6-multilib.patch, 1.3, NONE

[Jindrich Novy (jnovy)]

Author: jnovy

Update of /cvs/extras/rpms/mikmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5309

Modified Files:
	mikmod.spec sources 
Removed Files:
	libmikmod-3.1.11-a.diff libmikmod-64bit.patch 
	libmikmod-esd.patch libmikmod-strip-lib.patch 
	mikmod-3.1.6-multilib.patch 
Log Message:
- don't hardcode buildroot library paths to binaries/libs
- preserve timestamps
- link against libmikmod, remove mikmod-devel
- remove all libmikmod stuff, it's now packaged separately



Index: mikmod.spec
===================================================================
RCS file: /cvs/extras/rpms/mikmod/devel/mikmod.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- mikmod.spec	23 Aug 2007 06:45:52 -0000	1.35
+++ mikmod.spec	24 Oct 2007 10:03:01 -0000	1.36
@@ -3,19 +3,13 @@
 Summary: A MOD music file player
 Name: mikmod
 Version: 3.2.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2 and LGPLv2+
 Group: Applications/Multimedia
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: ncurses-devel texinfo
+BuildRequires: ncurses-devel libmikmod-devel
 URL: http://mikmod.raphnet.net/
 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:  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
@@ -29,81 +23,36 @@
 
 Install the mikmod package if you need a MOD music file player.
 
-%package devel
-Group: Development/Libraries
-Summary: Header files and documentation for compiling mikmod applications.
-Requires: %{name} = %{version}-%{release}
-PreReq: /sbin/install-info
-
-%description devel
-This package includes the header files you will need to compile
-applications for mikmod.
-
 %prep
-%setup -q -a 1 -n %{name}-%{version}-beta1
-%patch0 -p0
-%patch1 -p1 -b .esd
-%patch2 -p1 -b .64bit
-%patch3 -p1 -b .lib-strip
-%patch4 -p1 -b .multi
+%setup -q -n %{name}-%{version}-beta1
 
 %build
 rm -rf $RPM_BUILD_ROOT
-pushd libmikmod-%{lversion}
-%configure
-make install DESTDIR=$RPM_BUILD_ROOT
-popd
-
-# Trick it into compiling while libmikmod is not installed...
-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
 %configure \
-	--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`"
+make CFLAGS="$RPM_OPT_FLAGS `libmikmod-config --cflags`"
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-find $RPM_BUILD_ROOT | grep "\\.la$" | xargs rm -f
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-
-%post devel
-/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 || :
-fi
-
 %files
 %defattr(-, root, root)
 %doc AUTHORS COPYING NEWS README
-%doc libmikmod-%{lversion}/TODO
 %{_bindir}/mikmod
-%{_mandir}/man1/mikmod*
-%{_libdir}/*.so.*
-
-%files devel
-%defattr(-, root, root)
-%{_bindir}/*-config
-%{_libdir}/*.a
-%{_libdir}/*.so
-%{_datadir}/aclocal/*
 %{_datadir}/mikmod/mikmodrc
-%{_includedir}/*
-%{_infodir}/mikmod*
-%{_mandir}/man1/libmikmod-config*
+%{_mandir}/man1/mikmod*
 
 %changelog
+* Wed Sep 19 2007 Jindrich Novy <jnovy at redhat.com> 3.2.2-4
+- don't hardcode buildroot library paths to binaries/libs
+- preserve timestamps
+- link against libmikmod, remove mikmod-devel
+- remove all libmikmod stuff, it's now packaged separately
+
 * Thu Aug 23 2007 Jindrich Novy <jnovy at redhat.com> 3.2.2-3
 - update License
 - rebuild for BuildID


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mikmod/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Apr 2007 20:42:49 -0000	1.5
+++ sources	24 Oct 2007 10:03:01 -0000	1.6
@@ -1,2 +1 @@
 9a9534a054afe8d28cc784041e6d1519  mikmod-3.2.2-beta1.tar.gz
-705106da305e8de191549f1e7393185c  libmikmod-3.1.11.tar.gz


--- libmikmod-3.1.11-a.diff DELETED ---


--- libmikmod-64bit.patch DELETED ---


--- libmikmod-esd.patch DELETED ---


--- libmikmod-strip-lib.patch DELETED ---


--- mikmod-3.1.6-multilib.patch DELETED ---