Browse Source

supertuxkart: rebuild
others: new upstream release

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@6414 ec354946-7b23-47d6-9f5a-488ba84defc7

Takemikaduchi 11 years ago
parent
commit
a44a33fa61

+ 15 - 11
S/SDL/SDL-vl.spec

@@ -1,19 +1,19 @@
 Summary: Simple DirectMedia Layer
 Name: SDL
-Version: 1.2.14
-Release: 2%{?_dist_release}
+Version: 1.2.15
+Release: 1%{?_dist_release}
 License: LGPL
 Group: System Environment/Libraries
 URL: http://www.libsdl.org/
 Source0: http://www.libsdl.org/release/%{name}-%{version}.tar.gz
 
-Patch0: SDL-1.2.10-byteorder.patch
-Patch1: SDL-1.2.14-prefersounddaemons.patch
-
-#BuildRequires: XOrg-devel, XOrg-gl-devel
-BuildRequires: xorg-x11-devel, mesa-libGL-devel
-BuildRequires: alsa-lib-devel, esound-devel, arts-devel
+BuildRequires: libX11-devel
+BuildRequires: libXrender-devel
+BuildRequires: libXrandr-devel
+BuildRequires: mesa-libGL-devel
+BuildRequires: alsa-lib-devel, arts-devel
 BuildRequires: pulseaudio-libs-devel
+BuildRequires: libusb-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -49,8 +49,6 @@ to develop SDL applications.
 
 %prep
 %setup -q 
-%patch0 -p1 -b .byte
-%patch1 -p1 -b .prefer
 
 %build
 #libtoolize --force
@@ -71,7 +69,7 @@ make
 
 %install
 rm -rf %{buildroot}
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 ## remove unuse files
 rm -rf $RPM_BUILD_ROOT%{_libdir}/*.{a,la}
@@ -99,6 +97,12 @@ rm -rf %{buildroot}
 %{_datadir}/aclocal/*
 
 %changelog
+* Sun Jun 24 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.2.15-1
+- new upstream release
+- remove old patches
+- add BuildRequires; libusb-devel
+- remove BuildRequires; esound-devel
+
 * Sat Sep 25 2010 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 1.2.14-2
 - add "--disable-video-ps3"
 

+ 13 - 6
S/SDL_gfx/SDL_gfx-vl.spec

@@ -1,7 +1,7 @@
 Summary:	SDL graphics drawing primitives and other support functions
 Summary(ja): 	SDLの基本的な描画機能とその他の機能を提供するライブラリ
 Name:		SDL_gfx
-Version:	2.0.22
+Version:	2.0.23
 Release: 	1%{?_dist_release}
 Source0:	%{name}-%{version}.tar.gz
 License:	LGPL
@@ -9,6 +9,7 @@ Group:		System Environment/Libraries
 URL:		http://www.ferzkopp.net/joomla/
 
 BuildRequires:	SDL-devel >= 1.2.0
+BuildRequires:	libX11-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
 %define all_x86 i386 i586 i686 athlon
@@ -95,20 +96,22 @@ SDL_gfx のデモアプリケーションとソースコードです。
 %setup -q
 
 %build
-./autogen.sh
-%ifarch %{all_x86}
-./configure
+%ifarch %{ix86}
+%configure --disable-static
 %else
-./configure --disable-mmx
+%configure --disable-static --disable-mmx
 %endif
 %__make
 
 
 %install
 %__rm -rf $RPM_BUILD_ROOT
-%makeinstall
+%__make install DESTDIR=$RPM_BUILD_ROOT
 
 %__install -d $RPM_BUILD_ROOT/%{_datadir}/SDL_gfx-demos
+%__install -d $RPM_BUILD_ROOT/%{_datadir}/SDL_gfx-demos/m4
+%__install -m644 %{_builddir}/%{name}-%{version}/Test/m4/* $RPM_BUILD_ROOT/%{_datadir}/SDL_gfx-demos/m4
+%__rm -rf %{_builddir}/%{name}-%{version}/Test/m4
 %__install -m755 %{_builddir}/%{name}-%{version}/Test/* $RPM_BUILD_ROOT/%{_datadir}/SDL_gfx-demos
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la}
@@ -138,6 +141,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la}
 
 
 %changelog
+* Sun Jun 24 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.0.23-1
+- new upstream release
+- add BuildRequires: libX11-devel
+
 * Mon Sep 20 2010 IWAI, Masaharu <iwai@alib.jp> 2.0.22-1
 - new upstream release
 - add pkg-config file in devel package

+ 5 - 2
S/SDL_image/SDL_image-vl.spec

@@ -1,6 +1,6 @@
 Summary: Simple DirectMedia Layer - Sample Image Loading Library
 Name: SDL_image
-Version: 1.2.10
+Version: 1.2.12
 Release: 1%{?_dist_release}
 Source0: http://www.libsdl.org/projects/SDL_image/release/%{name}-%{version}.tar.gz
 License: LGPL
@@ -47,7 +47,7 @@ make
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 #install showimage 
 %__mkdir_p $RPM_BUILD_ROOT%{_bindir}
@@ -77,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/SDL/
 
 %changelog
+* Sun Jun 24 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.2.12-1
+- new upstream release
+
 * Mon Sep 20 2010 IWAI, Masaharu <iwai@alib.jp> 1.2.10-1
 - new upstream release
 - add pkg-config file in devel package

+ 9 - 5
S/SDL_mixer/SDL_mixer-vl.spec

@@ -1,7 +1,7 @@
 Summary: Simple DirectMedia Layer - Sample Mixer Library
 Name:    SDL_mixer
-Version: 1.2.11
-Release: 3%{?_dist_release}
+Version: 1.2.12
+Release: 1%{?_dist_release}
 Source0: http://www.libsdl.org/projects/%{name}/%{name}-%{version}.tar.gz
 License: LGPL
 Group: System Environment/Libraries
@@ -15,9 +15,9 @@ BuildRequires: autoconf
 BuildRequires: libvorbis-devel
 BuildRequires: libogg-devel
 BuildRequires: smpeg-devel
-BuildRequires: mikmod-devel
+BuildRequires: libmikmod-devel
 BuildRequires: audiofile-devel
-Requires: mikmod
+Requires: libmikmod
 Requires: libvorbis
 Requires: libogg
 Requires: smpeg
@@ -62,7 +62,7 @@ make %{?_smp_mflags} LDFLAGS=-lm
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # installed binary
 %__mkdir_p $RPM_BUILD_ROOT%{_bindir}
@@ -94,6 +94,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/SDL
 
 %changelog
+* Sun Jun 24 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.2.12-1
+- new upstream release
+- change BuildRequires: libmikmod-devel instead of mikmod-devel
+
 * Sat Jun 18 2011 Kazutaka HARADA <kazutaka@vinelinux.org> 1.2.11-3
 - rebuild for Vine Linux
 - add BuildRequires: smpeg-devel, mikmod-devel and audiofile-devel

+ 8 - 4
S/SDL_net/SDL_net-vl.spec

@@ -1,14 +1,14 @@
 Summary: SDL portable network library
 Name: SDL_net
-Version: 1.2.7
-Release: 2%{?_dist_release}
+Version: 1.2.8
+Release: 1%{?_dist_release}
 Source0: %{name}-%{version}.tar.gz
 URL: http://www.libsdl.org/projects/SDL_net/
 License: LGPL
 Group: System Environment/Libraries
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: SDL >= 1.2.4
+BuildRequires: SDL-devel >= 1.2.14
 BuildRequires: sane
 BuildRequires: libtool autoconf automake
 Requires: SDL
@@ -45,7 +45,7 @@ make
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la}
 
@@ -65,9 +65,13 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %doc README CHANGES COPYING
 %{_libdir}/lib*.so
+%{_libdir}/pkgconfig/%{name}.pc
 %{_includedir}/SDL/
 
 %changelog
+* Sun Jun 24 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.2.8-1
+- new upstream release
+
 * Mon Sep 20 2010 IWAI, Masaharu <iwai@alib.jp> 1.2.7-2
 - remove *.a
 

+ 4 - 1
S/SDL_ttf/SDL_ttf-vl.spec

@@ -1,6 +1,6 @@
 Summary: Simple DirectMedia Layer - Sample TrueType Font Library
 Name: SDL_ttf
-Version: 2.0.10
+Version: 2.0.11
 Release: 1%{?_dist_release}
 Group: System Environment/Libraries
 License: LGPL
@@ -76,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/SDL/
 
 %changelog
+* Sun Jun 24 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.0.11-1
+- new upstream release
+
 * Mon Sep 20 2010 IWAI, Masaharu <iwai@alib.jp> 2.0.10-1
 - new upstream release
 - add pkg-config file in devel package

+ 7 - 4
b/bluez/bluez-vl.spec

@@ -1,7 +1,7 @@
 Summary: Bluetooth utilities
 Summary(ja): Bluetooth ユーティリティ 
 Name: bluez
-Version: 4.99
+Version: 4.101
 Release: 1%{?_dist_release}
 License: GPLv2+
 Group: Applications/System
@@ -210,7 +210,6 @@ rm -f ${RPM_BUILD_ROOT}/%{_sysconfdir}/udev/*.rules
 install -D -m0644 scripts/bluetooth-serial.rules ${RPM_BUILD_ROOT}/%{_sysconfdir}/udev/rules.d/97-bluetooth-serial.rules
 install -D -m0755 scripts/bluetooth_serial ${RPM_BUILD_ROOT}/lib/udev/bluetooth_serial
 install -D -m0644 scripts/bluetooth-hid2hci.rules ${RPM_BUILD_ROOT}/%{_sysconfdir}/udev/rules.d/97-bluetooth-hid2hci.rules
-install -D -m0644 scripts/bluetooth.rules ${RPM_BUILD_ROOT}/lib/udev/rules.d/96-bluetooth.rules
 
 install -D -m0755 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules/bluez-uinput.modules
 
@@ -251,12 +250,13 @@ exit 0
 %config(noreplace) %{_sysconfdir}/bluetooth/*
 %config(noreplace) %{_sysconfdir}/sysconfig/*
 %config %{_sysconfdir}/dbus-1/system.d/bluetooth.conf
+%{_sysconfdir}/udev/rules.d/*.rules
+%{_sysconfdir}/rc.d/init.d/*
 %{_libdir}/bluetooth/
+%{_datadir}/dbus-1/system-services/org.bluez.service
 /lib/udev/bluetooth_serial
 /lib/udev/hid2hci
-%{_sysconfdir}/udev/rules.d/*.rules
 /lib/udev/rules.d/*.rules
-%{_sysconfdir}/rc.d/init.d/*
 
 %files libs
 %defattr(-, root, root)
@@ -286,6 +286,9 @@ exit 0
 %{_libdir}/alsa-lib/*.so
 
 %changelog
+* Sun Jun 24 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.101-1
+- new upstream release
+
 * Sun Mar 11 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.99-1
 - new upstream release
 

+ 172 - 0
lib/libm/libmikmod/libmikmod-vl.spec

@@ -0,0 +1,172 @@
+Summary: A MOD music file player library
+Name: libmikmod
+Version: 3.2.0
+Release: 1%{?_dist_release}
+License: GPLv2 and LGPLv2+
+Group: Applications/Multimedia
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+URL: http://http://mikmod.shlomifish.org/
+Source0: http://mikmod.shlomifish.org/files/libmikmod-%{version}.tar.gz
+Patch0:  libmikmod-64bit.patch
+Patch2:  libmikmod-strip-lib.patch
+Patch3:  libmikmod-multilib.patch
+Patch6:  libmikmod-CVE-2007-6720.patch
+Patch7:  libmikmod-CVE-2009-0179.patch
+
+BuildRequires: libX11-devel
+
+Vendor: Project Vine
+Distribution: Vine Linux
+
+
+%description
+libmikmod is a library used by the mikmod MOD music file player for
+UNIX-like systems. Supported file formats include MOD, STM, S3M, MTM,
+XM, ULT and IT.
+
+%package devel
+Group: Development/Libraries
+Summary: Header files and documentation for compiling mikmod applications
+Requires: %{name} = %{version}-%{release}
+Requires(post): /sbin/install-info
+Requires(postun): /sbin/install-info
+Provides: mikmod-devel = 3.2.2
+Obsoletes: mikmod-devel < 3.2.2
+
+%description devel
+This package includes the header files you will need to compile
+applications for mikmod.
+
+%prep
+%setup -q
+%patch0 -p1 -b .64bit
+%patch2 -p1 -b .strip-lib
+%patch3 -p1 -b .multilib
+%patch6 -p1 -b .CVE-2007-6720
+%patch7 -p1 -b .CVE-2009-0179
+
+%build
+%configure --enable-dl --disable-altivec
+make %{?_smp_flags}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+rm -f $RPM_BUILD_ROOT%{_infodir}/dir $RPM_BUILD_ROOT%{_libdir}/*.a
+find $RPM_BUILD_ROOT | grep "\\.la$" | xargs rm -f
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post -p /sbin/ldconfig
+
+%post devel
+[ -x /sbin/install-info ] && /sbin/install-info %{_infodir}/mikmod.info %{_infodir}/dir > /dev/null 2>&1 || :
+
+%postun -p /sbin/ldconfig
+
+%postun devel
+if [ $1 = 0 ] ; then
+	[ -x /sbin/install-info ] && /sbin/install-info  --delete %{_infodir}/mikmod.info %{_infodir}/dir > /dev/null 2>&1 || :
+fi
+
+%files
+%defattr(-, root, root)
+%doc AUTHORS COPYING.LIB COPYING.LESSER NEWS README TODO
+%{_libdir}/*.so.*
+
+%files devel
+%defattr(-, root, root)
+%{_bindir}/*-config
+%{_libdir}/*.so
+%{_datadir}/aclocal/*
+%{_includedir}/*
+%{_infodir}/mikmod*
+%{_mandir}/man1/libmikmod-config*
+
+%changelog
+* Sun Jun 24 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.2.0-1
+- initial build for Vine Linux
+
+
+* Wed Jun 06 2012 Jindrich Novy <jnovy@redhat.com> 3.2.0-1
+- update to stable libmikmod-3.2.0
+
+* Sun May 13 2012 Karsten Hopp <karsten@redhat.com> 3.2.0-14.beta4.1
+- disable altivec (used on PPC only) 
+
+* Sun May 13 2012 Jindrich Novy <jnovy@redhat.com> - 3.2.0-13.beta4
+- update to 3.2.0-beta4
+
+* Tue Apr 10 2012 Jindrich Novy <jnovy@redhat.com> - 3.2.0-13.beta3
+- update to 3.2.0-beta3
+- drop upstreamed patches, forwardport the rest
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.0-13.beta2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.0-12.beta2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Fri Aug 20 2010 Jindrich Novy <jnovy@redhat.com> 3.2.0-11.beta2
+- update the CVE-2009-3995,3996 patch and fix its naming
+
+* Thu Jul 15 2010 Jindrich Novy <jnovy@redhat.com> 3.2.0-10.beta2
+- fix CVE-2009-3995,3996 (#614643)
+
+* Mon Nov 23 2009 Hans de Goede <hdegoede@redhat.com> 3.2.0-9.beta2
+- Fix CVE-2007-6720 fix, it causes mods to sound wrong, and even causes
+  crashes under certain circumstances (#540234), see:
+  http://bugzilla.libsdl.org/show_bug.cgi?id=506
+
+* Fri Aug 28 2009 Jindrich Novy <jnovy@redhat.com> 3.2.0-8.beta2
+- fix CVE-2009-0179 (#519992)
+
+* Fri Aug 28 2009 Jindrich Novy <jnovy@redhat.com> 3.2.0-7.beta2
+- fix CVE-2007-6720 (#519990)
+
+* Tue Aug 11 2009 Jindrich Novy <jnovy@redhat.com> 3.2.0-6.beta2
+- don't complain if installing with --excludedocs (#515953)
+- add missing requires
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.0-5.beta2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.0-4.beta2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Feb 18 2008 Hans de Goede <j.w.r.degoede@hhs.nl> 3.2.0-3.beta2
+- Fix MikMod_InfoLoader() and MikMod_InfoDriver() functions, fixing mikmod -n
+  output
+
+* Mon Feb 18 2008 Hans de Goede <j.w.r.degoede@hhs.nl> 3.2.0-2.beta2
+- Replace completely braindead (hint to author, drink coffee first, then code)
+  esd non blocking patch with one that actually works. This fixes using mikmod
+  with pulseaudio (bz 247865)
+- Note: this makes the 2 supported output devices oss and esd (and pulseaudio's
+  esd emulation) alsa is not supported, this requires a rewrite of the mikmod
+  alsa code which was written for alsa-0.5 and never updated for the new alsa
+  0.9/1.0 api
+
+* Fri Feb 15 2008 Jindrich Novy <jnovy@redhat.com> 3.2.0-1
+- update to libmikmod-3.2.0-beta2
+- fix playback on 64bit arches
+
+* Thu Feb 14 2008 Jindrich Novy <jnovy@redhat.com> 3.1.11-5
+- fix rpath patch so that there are no undefined symbols in
+  libmikmod.so (#431745)
+
+* Thu Oct 25 2007 Jindrich Novy <jnovy@redhat.com> 3.1.11-4
+- virtually provide mikmod-devel
+
+* Wed Oct 24 2007 Jindrich Novy <jnovy@redhat.com> 3.1.11-3
+- add multilib patch
+
+* Tue Oct 23 2007 Jindrich Novy <jnovy@redhat.com> 3.1.11-2
+- update description
+- add smp_flags to make
+- don't ship static library
+- update upstream patch, drop texinfo dependency (thanks to Stepan Kasal)
+
+* Wed Oct 18 2007 Jindrich Novy <jnovy@redhat.com> 3.1.11-1
+- package libmikmod

+ 21 - 81
m/mikmod/mikmod-vl.spec

@@ -1,35 +1,23 @@
-# libmikmod rpm specification file
-%define lversion 3.1.11
-
 Summary: A MOD music file player.
 Summary(ja): MOD ファイル再生プログラム
 Name: mikmod
-Version: 3.1.6
-Release: 34%{?_dist_release}
+Version: 3.2.2
+Release: 1%{?_dist_release}
 License: GPL/LGPL
 Group: Applications/Multimedia
-Prereq: /sbin/ldconfig
-Prefix: /usr
+Requires(post,postun): /sbin/ldconfig
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Requires: gpm ncurses
-BuildRequires: gpm ncurses
-BuildPrereq: ncurses-devel texinfo
+Requires: libmikmod
+BuildRequires: gpm-devel
+BuildRequires: ncurses-devel texinfo
+BuildRequires: libmikmod-devel >= 3.2.0
 URL: http://mikmod.raphnet.net/
 Source0: http://mikmod.raphnet.net/files/mikmod-%{version}.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
-Provides: libmikmod = %{lversion}-%{release}
-#Obsoletes: tracker
 
 Vendor: Project Vine
 Distribution: Vine Linux
-Packager: OOI Keita <ooi.keita@gmail.com>
+Packager: OOI Keita <ooi.keita@gmail.com>, Takemikaduchi
 
 %description
 MikMod is one of the best and most well known MOD music file players
@@ -49,88 +37,40 @@ mikmod はとても手軽な音楽トラック再生プログラムです。
 その中には Impulse Tracker の圧縮サンプルも含まれます。
 その他にも、多くのアーカイブ形式にも対応しています。
 
-%package devel
-Group: Development/Libraries
-Summary: Header files and documentation for compiling mikmod applications.
-Requires: %{name} = %{version}-%{release}
-PreReq: /sbin/install-info
-Provides: libmikmod-devel = %{lversion}-%{release}
-
-%description devel
-This package includes the header files you will need to compile
-applications for mikmod.
 
 %prep
-%setup -q -a 1 
-%patch0 -p0
-%patch1 -p1 -b .strip
-%patch2 -p1 -b .esd
-%patch3 -p1
-%patch4 -p1 -b .orig
-%patch5 -p1 
-%patch6 -p1 -b .lib-strip
+%setup -q 
 
 %build
 rm -rf $RPM_BUILD_ROOT
-cd libmikmod-%{lversion}
-cp /usr/share/libtool/config.{sub,guess} .
-%configure
-make
-%makeinstall
-cd ..
-
-# 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 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 \
-	--disable-libmikmodtest
-make CFLAGS="$RPM_OPT_FLAGS `libmikmod-%{lversion}/libmikmod-config --cflags` -I."
+%configure 
 
 %install
-%makeinstall
-rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-
-## remove unuse files
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -fr $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*
+%{_bindir}/%{name}
+%{_datadir}/%{name}/mikmodrc
+%{_mandir}/man1/%{name}.1.gz
 
-%files devel
-%defattr(-, root, root)
-%{_bindir}/*-config
-%{_libdir}/*.a
-#%{_libdir}/*.la
-%{_datadir}/aclocal/*
-%{_includedir}/*
-%{_infodir}/mikmod*
-%{_mandir}/man1/libmikmod-config*
 
 %changelog
+* Sun Jun 24 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.2.2-1
+- new upstream release
+- remove old patches
+- remove Source1
+- remove devel sub package
+- add BuildRequires: libmikmod-devel
+
 * Sat Sep 20 2008 Shu KONNO <owa@bg.wakwak.com> 3.1.6-34vl5
 - applied new versioning policy, spec in utf-8
 - removed *.la

+ 10 - 6
s/supertuxkart/supertuxkart-vl.spec

@@ -1,6 +1,6 @@
 %define name supertuxkart
 %define version 0.7
-%define release 1%{?_dist_release}
+%define release 2%{?_dist_release}
 
 Summary: An enhanced version of TuxKart, a kart racing game
 Summary(ja): TuxKartを拡張したカートレーシングゲーム
@@ -13,12 +13,13 @@ License: GPL
 Group: Applications/Games
 URL: http://supertuxkart.sourceforge.net/
 
-Requires: mesa-libGL, SDL, plib, openal, freealut, mikmod
+Requires: mesa-libGL, SDL, plib, openal, freealut, libmikmod
 BuildRequires: xorg-x11-devel, mesa-libGL-devel, plib-devel, SDL-devel 
-BuildRequires: openal-devel, freealut-devel, mikmod-devel
+BuildRequires: openal-devel, freealut-devel, libmikmod-devel
 BuildRequires: libvorbis-devel libogg-devel
 BuildRequires: freeglut-devel 
-BuildRequires: irrlicht-devel fribidi-devel
+BuildRequires: irrlicht-devel
+BuildRequires: fribidi-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -38,11 +39,11 @@ chmod ugo-x AUTHORS COPYING NEWS README TODO
 
 %build
 %configure
-%{__make} %{?_smp_mflags}
+%{__make} %{?_smp_mflags} LDFLAGS=-lGLU irrlicht_LIBS="-lIrrlicht -lIrrXML"
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
-#%{__make} DESTDIR=$RPM_BUILD_ROOT install 
+#{__make} DESTDIR=$RPM_BUILD_ROOT install 
 %makeinstall
 
 ## remove unpackaged files
@@ -62,6 +63,9 @@ chmod ugo-x AUTHORS COPYING NEWS README TODO
 
 
 %changelog
+* Sun Jun 24 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.7-2
+- change BuildRequires: libmikmod-devel instead of mikmod-devel
+
 * Wed Mar 16 2011 Kazutaka HARADA <kazutaka@vinelinux.org> 0.7-1
 - new upstream release
 - add BuildRequires: irrlicht-devel fribidi-devel