rpms/ladspa-swh-plugins/devel ladspa-swh-plugins-libgsm.patch, NONE, 1.1 swh-plugins-plugin-Makefile.am.patch, NONE, 1.1 ladspa-swh-plugins.spec, 1.4, 1.5

[Anthony Green (green)]

Author: green

Update of /cvs/extras/rpms/ladspa-swh-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14463

Modified Files:
	ladspa-swh-plugins.spec 
Added Files:
	ladspa-swh-plugins-libgsm.patch 
	swh-plugins-plugin-Makefile.am.patch 
Log Message:
Rev -9.  Use system gsm library.  Solve -fPIC/SELinux problem.


ladspa-swh-plugins-libgsm.patch:

--- NEW FILE ladspa-swh-plugins-libgsm.patch ---
--- Makefile.am~	2006-08-08 08:56:35.000000000 -0700
+++ Makefile.am	2007-10-09 05:19:28.000000000 -0700
@@ -33,7 +33,7 @@
 	latency_1914.la xfade_1915.la sc4m_1916.la \
 	mbeq_1197.la pitch_scale_1193.la pitch_scale_1194.la imp_1199.la
 
-SUBDIRS = m4  po util gsm gverb metadata
+SUBDIRS = m4  po util gverb metadata
 
 # Wacky stuff to stop automake getting confused
 EXTRA_DIST = @top_srcdir@/*.xml @top_srcdir@/*.c @top_srcdir@/*.h \
@@ -72,7 +72,7 @@
 sc4_1882_la_LIBADD = util/libdb.a util/librms.a
 sc4m_1916_la_LIBADD = util/libdb.a util/librms.a
 se4_1883_la_LIBADD = util/libdb.a util/librms.a
-gsm_1215_la_LIBADD = gsm/libgsm.a
+gsm_1215_la_LIBADD = -lgsm
 gverb_1216_la_LIBADD = gverb/libgverb.a
 lcr_delay_1436_la_DEPENDENCIES = util/biquad.h
 
--- configure.in~	2006-08-08 08:47:16.000000000 -0700
+++ configure.in	2007-10-09 05:19:53.000000000 -0700
@@ -135,7 +135,7 @@
   AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}")
 fi
 
-subdirs="util gsm gverb metadata"
+subdirs="util gverb metadata"
 
 AC_SUBST(subdirs)
 AC_SUBST(FFTW_LIBS)
@@ -145,7 +145,6 @@
 AC_OUTPUT([ m4/Makefile 
 Makefile
 util/Makefile
-gsm/Makefile
 gverb/Makefile
 metadata/Makefile
 po/Makefile.in

swh-plugins-plugin-Makefile.am.patch:

--- NEW FILE swh-plugins-plugin-Makefile.am.patch ---
--- Makefile.am~	2007-10-09 05:22:38.000000000 -0700
+++ Makefile.am	2007-10-09 05:33:20.000000000 -0700
@@ -39,7 +39,7 @@
 EXTRA_DIST = @top_srcdir@/*.xml @top_srcdir@/*.c @top_srcdir@/*.h \
 	@top_srcdir@/*.dtd @top_srcdir@/*.pl @top_srcdir@/*.css \
 	@top_srcdir@/impulses/*.h autogen.sh bozosoity-checker.pl
-plugindir = @prefix@/lib/ladspa
+plugindir = $(libdir)/ladspa
 
 # Uncomment below for Darwin support.  Or add a conditional for this.
 #AM_CFLAGS = -fno-common -flat_namespace -bundle -undefined suppress -lbundle1.o


Index: ladspa-swh-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/ladspa-swh-plugins/devel/ladspa-swh-plugins.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ladspa-swh-plugins.spec	6 Feb 2007 14:46:14 -0000	1.4
+++ ladspa-swh-plugins.spec	9 Oct 2007 13:11:08 -0000	1.5
@@ -3,16 +3,17 @@
 Summary:      A set of audio plugins for LADSPA
 Name:         ladspa-%{pkgname}
 Version:      0.4.15
-Release:      8%{?dist}
-License:      GPL
+Release:      9%{?dist}
+License:      GPLv2+
 Group:        Applications/Multimedia
 Source:       http://plugin.org.uk/releases/0.4.15/swh-plugins-0.4.15.tar.gz
-Patch0:       swh-plugins-0.4.14-Makefile.in.patch
-Patch1:       swh-plugins-0.4.15-fPIC.patch
+Patch0:       ladspa-swh-plugins-libgsm.patch
+Patch1:       swh-plugins-plugin-Makefile.am.patch
 URL:          http://plugin.org.uk/
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: fftw3-devel ladspa-devel libxml2-devel pkgconfig libtool
+BuildRequires: fftw3-devel ladspa-devel libxml2-devel pkgconfig libtool gsm-devel
+Requires:     ladspa
 
 Obsoletes:    %{pkgname} < 0.4.15-5
 Provides:     %{pkgname} = %{version}-%{release}
@@ -27,7 +28,8 @@
 %patch1 -p0
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %configure --disable-static
+autoreconf
+CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" %configure --disable-static
 %{__make} %{?_smp_mflags} static
 
 %install
@@ -45,6 +47,12 @@
 %{_datadir}/ladspa/rdf/*
 
 %changelog
+* Tue Oct 08 2007 Anthony Green <green at redhat.com> 0.4.15-9
+- Use the system gsm library.
+- Require ladspa to prevent orphaned directories.
+- Add -fPIC -DPIC to CFLAGS.  Removed patch from rev -7.
+- Update license tag.
+
 * Sat Feb 03 2007 Anthony Green <green at redhat.com> 0.4.15-8
 - BuildRequire libtool.