packages: libmp3splt/libmp3splt.spec, libmp3splt/ltdl.patch (NEW) - drop lt...

[wiget]

Author: wiget                        Date: Tue Mar 15 14:16:58 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- drop ltdl bcond
- added apidocs bcond
- added -avoid-version for plugins
- removed plugins from devel and static subpackage

---- Files affected:
packages/libmp3splt:
   libmp3splt.spec (1.2 -> 1.3) , ltdl.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/libmp3splt/libmp3splt.spec
diff -u packages/libmp3splt/libmp3splt.spec:1.2 packages/libmp3splt/libmp3splt.spec:1.3
--- packages/libmp3splt/libmp3splt.spec:1.2	Tue Mar 15 08:23:08 2011
+++ packages/libmp3splt/libmp3splt.spec	Tue Mar 15 15:16:52 2011
@@ -1,8 +1,8 @@
 # $Revision$, $Date$
 #
 # Conditional build:
+%bcond_without	apidocs		# do not build and package API docs
 %bcond_without	static_libs	# don't build static libraries
-%bcond_without	ltdl		# don't build ltdl
 #
 Summary:	Libraries for the mp3splt project
 Summary(pl.UTF-8):	Biblioteki do projektu mp3splt
@@ -13,6 +13,7 @@
 Group:		Libraries
 Source0:	http://downloads.sourceforge.net/mp3splt/%{name}-%{version}.tar.gz
 # Source0-md5:	a6a00d83e49adf27abb7a0cb0ea384a4
+Patch0:		ltdl.patch
 URL:		http://mp3splt.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -20,7 +21,12 @@
 BuildRequires:	libid3tag-devel
 BuildRequires:	libmad-devel
 BuildRequires:	libtool
+BuildRequires:	libltdl-devel
 BuildRequires:	libvorbis-devel
+%if %{with apidocs}
+BuildRequires:	doxygen
+BuildRequires:	graphviz
+%endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -74,10 +80,20 @@
 %description static -l pl.UTF-8
 Statyczna biblioteka libmp3splt.
 
+%package apidocs
+Summary:	libmp3splt API documentation
+Summary(pl.UTF-8):	Dokumentacja API biblioteki libmp3splt
+Group:		Documentation
+
+%description apidocs
+API and internal documentation for libmp3splt library.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API biblioteki libmp3splt.
+
 %prep
 %setup -q
-# Avoid standard rpaths on lib64 archs:
-sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
+%patch0 -p1
 
 %build
 %{__gettextize}
@@ -87,13 +103,14 @@
 %{__autoheader}
 %{__automake}
 %configure \
-%if %{with ltdl}
 	--with-ltdl-lib=%{_libdir} \
 	--with-ltdl-include=%{_includedir} \
-%endif
 	%{!?with_static_libs:--disable-static}
 
 %{__make}
+%if %{with apidocs}
+%{__make} -C doc doc
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -101,6 +118,8 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/*.{a,la}
+
 %find_lang %{name}
 
 %clean
@@ -114,19 +133,13 @@
 %doc AUTHORS ChangeLog NEWS README TODO
 %attr(755,root,root) %{_libdir}/libmp3splt.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libmp3splt.so.0
-%attr(755,root,root) %{_libdir}/%{name}/libsplt_mp3.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/%{name}/libsplt_mp3.so.0
-%attr(755,root,root) %{_libdir}/%{name}/libsplt_ogg.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/%{name}/libsplt_ogg.so.0
+%attr(755,root,root) %{_libdir}/%{name}/libsplt_mp3.so
+%attr(755,root,root) %{_libdir}/%{name}/libsplt_ogg.so
 
 %files devel
 %defattr(644,root,root,755)
 %{_libdir}/libmp3splt.so
 %{_libdir}/libmp3splt.la
-%{_libdir}/%{name}/libsplt_mp3.so
-%{_libdir}/%{name}/libsplt_mp3.la
-%{_libdir}/%{name}/libsplt_ogg.so
-%{_libdir}/%{name}/libsplt_ogg.la
 %{_includedir}/libmp3splt
 %{_aclocaldir}/mp3splt.m4
 
@@ -134,8 +147,12 @@
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libmp3splt.a
-%{_libdir}/%{name}/libsplt_mp3.a
-%{_libdir}/%{name}/libsplt_ogg.a
+%endif
+
+%if %{with apidocs}
+%files apidocs
+%defattr(644,root,root,755)
+%doc doc/html/*
 %endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -144,6 +161,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2011/03/15 14:16:52  wiget
+- drop ltdl bcond
+- added apidocs bcond
+- added -avoid-version for plugins
+- removed plugins from devel and static subpackage
+
 Revision 1.2  2011/03/15 07:23:08  duddits
 - clean up
 

================================================================
Index: packages/libmp3splt/ltdl.patch
diff -u /dev/null packages/libmp3splt/ltdl.patch:1.1
--- /dev/null	Tue Mar 15 15:16:58 2011
+++ packages/libmp3splt/ltdl.patch	Tue Mar 15 15:16:52 2011
@@ -0,0 +1,24 @@
+--- libmp3splt-0.6.1a/src/plugins.c.wiget	2011-03-15 11:33:11.704147893 +0100
++++ libmp3splt-0.6.1a/src/plugins.c	2011-03-15 11:33:51.832156823 +0100
+@@ -103,8 +103,8 @@ static int splt_p_filter_plugin_files(co
+ 
+ #ifndef __WIN32__
+         //gnu/linux .so.0
+-        p_end = strstr(file, ".so.0");
+-        if (p_end != NULL && (p_start == p_end) && (*(p_end+5) == '\0'))
++        p_end = strstr(file, ".so");
++        if (p_end != NULL && (p_start == p_end) && (*(p_end+3) == '\0'))
+         {
+           return 1;
+         }
+--- libmp3splt-0.6.1a/plugins/Makefile.am.wiget	2011-03-15 11:34:11.244527716 +0100
++++ libmp3splt-0.6.1a/plugins/Makefile.am	2011-03-15 11:34:41.346369612 +0100
+@@ -5,7 +5,7 @@ plugin_LTLIBRARIES =
+ #ccommon_LDFLAGS = -module -export-dynamic -avoid-version
+ common_CPPFLAGS = -I$(top_srcdir)/include/libmp3splt -I$(top_srcdir)/src
+ common_LDFLAGS = -L$(top_builddir)/src -L$(top_builddir)/src/.libs -L/lib \
+-   -no-undefined -lm -lmp3splt @LIBINTL@
++   -no-undefined -avoid-version -lm -lmp3splt @LIBINTL@
+ 
+ if WIN32
+ common_LDFLAGS += -lz -lws2_32 -lintl
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libmp3splt/libmp3splt.spec?r1=1.2&r2=1.3&f=u