Mercurial > hg > xmms-sid

changeset 133:79a526595d16

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed spec-file generation and errors in the specfile.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 16 Jan 2004 05:47:05 +0000
parents 4162a5370b9e
children d4f8f5632bd6
files configure.in xmms-sid.spec.in
diffstat 2 files changed, 6 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/configure.in	Fri Jan 16 02:53:02 2004 +0000
+++ b/configure.in	Fri Jan 16 05:47:05 2004 +0000
@@ -6,7 +6,7 @@
 AC_PREREQ(2.56)
 
 dnl Initialize
-AC_INIT(XMMS-SID, 0.8.0beta8, ccr@tnsp.org)
+AC_INIT(XMMS-SID, 0.8.0beta9, ccr@tnsp.org)
 AC_COPYRIGHT([[(C) 2003-2004 Matti 'ccr' Hämäläinen]])
 AC_CONFIG_SRCDIR(src/xmms-sid.h)
 AM_INIT_AUTOMAKE
@@ -190,7 +190,6 @@
 fi
 if test "$xs_have_sidplay1" = yes; then
 	AC_DEFINE(HAVE_SIDPLAY1)
-	xs_reqlib="$xs_reqlib libsidplay.so.1"
 	OPT_SIDPLAY1="yes"
 fi
 
@@ -210,7 +209,6 @@
 fi
 if test "$xs_have_sidplay2" = yes; then
 	AC_DEFINE(HAVE_SIDPLAY2)
-	xs_reqlib="$xs_reqlib libsidplay.so.2"
 	OPT_SIDPLAY2="yes"
 	BUILDERS_FIND
 	BUILDERS_FIND_RESID
@@ -238,8 +236,6 @@
 fi
 
 
-AC_SUBST(REQUIRE_LIBRARY,$xs_reqlib)
-
 dnl ***
 dnl *** Check if we have some emulator library available?
 dnl ***
--- a/xmms-sid.spec.in	Fri Jan 16 02:53:02 2004 +0000
+++ b/xmms-sid.spec.in	Fri Jan 16 05:47:05 2004 +0000
@@ -2,6 +2,7 @@
 %define	name	@PACKAGE@
 %define	version	@VERSION@
 %define	release	1
+%define plugindir `xmms-config --input-plugin-dir`
 
 Summary:	A SID-tune (C64 music) input plugin for XMMS
 Name:		%{name}
@@ -13,8 +14,8 @@
 Url:		http://www.tnsp.org/xmms-sid.php
 Source:		http://www.tnsp.org/xs-files/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
+BuildRequires:	xmms-devel >= @XMMS_VERSION@
 Requires:	gtk+ >= 1.2.8, glib >= 1.2.8, xmms >= @XMMS_VERSION@
-Requires:	@REQUIRE_LIBRARY@
 
 ###########################################################
 %description
@@ -39,13 +40,13 @@
 ###########################################################
 %build
 export CFLAGS="$RPM_OPT_FLAGS" CPPFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS";
-%configure
+%configure --libdir=%{plugindir}
 make
 
 ###########################################################
 %install
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
-%makeinstall
+%makeinstall libdir=$RPM_BUILD_ROOT/%{plugindir}
 
 ###########################################################
 %post	-p /sbin/ldconfig
@@ -61,4 +62,4 @@
 %files
 %defattr(-, root, root)
 %doc AUTHORS COPYING FAQ NEWS README* THANKS TODO BUGS
-%{_libdir}/xmms/Input/*.so
+/