packages: live/TODO, live/live.spec - cleanups

blues blues at pld-linux.org
Sat Jul 18 14:24:27 CEST 2009 

Author: blues                        Date: Sat Jul 18 12:24:27 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- cleanups

---- Files affected:
packages/live:
   TODO (1.2 -> 1.3) , live.spec (1.50 -> 1.51) 

---- Diffs:

================================================================
Index: packages/live/TODO
diff -u packages/live/TODO:1.2 packages/live/TODO:1.3
--- packages/live/TODO:1.2	Sat Jul 18 13:27:43 2009
+++ packages/live/TODO	Sat Jul 18 14:24:22 2009
@@ -1,2 +1,3 @@
 # TODO:
 - package mediaServer (from shared build).
+- shared library is not usable, yet

================================================================
Index: packages/live/live.spec
diff -u packages/live/live.spec:1.50 packages/live/live.spec:1.51
--- packages/live/live.spec:1.50	Sat Jul 18 13:33:33 2009
+++ packages/live/live.spec	Sat Jul 18 14:24:22 2009
@@ -3,7 +3,7 @@
 Summary(pl.UTF-8):	Biblioteki LIVE555 do strumieni multimedialnych
 Name:		live
 Version:	2009.07.09
-Release:	2.6
+Release:	3
 Epoch:		2
 License:	LGPL v2.1+
 Group:		Development/Libraries
@@ -17,7 +17,11 @@
 BuildRequires:	sed >= 4.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		specflags	-fno-strict-aliasing
+%define		_livedir		%{_libdir}/liveMedia
+%define		specflags		-fno-strict-aliasing
+# Should be changed on every ABI change
+# Alexis Ballier <aballier at gentoo.org>:
+%define		LIVE_ABI_VERSION	1
 
 %description
 LIVE555 libraries for streaming media.
@@ -25,6 +29,14 @@
 %description -l pl.UTF-8
 Biblioteki LIVE555 do strumieni multimedialnych.
 
+%package libs
+Summary:        Shared LIVE555 libraries
+Group:          Development/Libraries
+Requires:       %{name} = %{epoch}:%{version}-%{release}
+
+%description libs
+Shared LIVE555 libraries
+
 %package devel
 Summary:        Header files for developing programs using LIVE555
 Summary(pl.UTF-8):      Pliki nagłówkowe do biblioteki LIVE555
@@ -41,7 +53,7 @@
 Summary:        Static version LIVE555 library
 Summary(pl.UTF-8):      Biblioteka statyczna LIVE555
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name}-devel = %{epoch}:%{version}-%{release}
 
 %description static
 Static LIVE555 library.
@@ -70,18 +82,19 @@
 %{__make} \
 	C_COMPILER="%{__cc}" \
 	CPLUSPLUS_COMPILER="%{__cxx}" \
+	LIB_SUFFIX="so.%{LIVE_ABI_VERSION}" \
 	COMPILE_OPTS="\$(INCLUDES) -I. %{rpmcflags} -DSOCKLEN_T=socklen_t"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_libdir}/liveMedia/{liveMedia,groupsock,UsageEnvironment,BasicUsageEnvironment} \
+install -d $RPM_BUILD_ROOT%{_livedir}/{liveMedia,groupsock,UsageEnvironment,BasicUsageEnvironment} \
 	$RPM_BUILD_ROOT%{_includedir}/liveMedia
 
 cd %{name}-static
-install liveMedia/libliveMedia.a $RPM_BUILD_ROOT%{_libdir}/liveMedia/liveMedia
-install groupsock/libgroupsock.a $RPM_BUILD_ROOT%{_libdir}/liveMedia/groupsock
-install UsageEnvironment/libUsageEnvironment.a $RPM_BUILD_ROOT%{_libdir}/liveMedia/UsageEnvironment
-install BasicUsageEnvironment/libBasicUsageEnvironment.a $RPM_BUILD_ROOT%{_libdir}/liveMedia/BasicUsageEnvironment
+install liveMedia/libliveMedia.a $RPM_BUILD_ROOT%{_livedir}/liveMedia
+install groupsock/libgroupsock.a $RPM_BUILD_ROOT%{_livedir}/groupsock
+install UsageEnvironment/libUsageEnvironment.a $RPM_BUILD_ROOT%{_livedir}/UsageEnvironment
+install BasicUsageEnvironment/libBasicUsageEnvironment.a $RPM_BUILD_ROOT%{_livedir}/BasicUsageEnvironment
 
 install liveMedia/include/* $RPM_BUILD_ROOT%{_includedir}/liveMedia
 install UsageEnvironment/include/* $RPM_BUILD_ROOT%{_includedir}/liveMedia
@@ -89,10 +102,14 @@
 install groupsock/include/* $RPM_BUILD_ROOT%{_includedir}/liveMedia
 
 cd ../%{name}-shared
-install liveMedia/libliveMedia.so $RPM_BUILD_ROOT%{_libdir}/liveMedia/liveMedia
-install groupsock/libgroupsock.so $RPM_BUILD_ROOT%{_libdir}/liveMedia/groupsock
-install UsageEnvironment/libUsageEnvironment.so $RPM_BUILD_ROOT%{_libdir}/liveMedia/UsageEnvironment
-install BasicUsageEnvironment/libBasicUsageEnvironment.so $RPM_BUILD_ROOT%{_libdir}/liveMedia/BasicUsageEnvironment
+install liveMedia/libliveMedia.so.%{LIVE_ABI_VERSION} $RPM_BUILD_ROOT%{_livedir}/liveMedia
+ln -s libliveMedia.so.%{LIVE_ABI_VERSION} $RPM_BUILD_ROOT%{_livedir}/liveMedia/libliveMedia.so
+install groupsock/libgroupsock.so.%{LIVE_ABI_VERSION} $RPM_BUILD_ROOT%{_livedir}/groupsock
+ln -s libgroupsock.so.%{LIVE_ABI_VERSION} $RPM_BUILD_ROOT%{_livedir}/groupsock/libgroupsock.so
+install UsageEnvironment/libUsageEnvironment.so.%{LIVE_ABI_VERSION} $RPM_BUILD_ROOT%{_livedir}/UsageEnvironment
+ln -s libUsageEnvironment.so.%{LIVE_ABI_VERSION} $RPM_BUILD_ROOT%{_livedir}/UsageEnvironment/libUsageEnvironment.so
+install BasicUsageEnvironment/libBasicUsageEnvironment.so.%{LIVE_ABI_VERSION} $RPM_BUILD_ROOT%{_livedir}/BasicUsageEnvironment
+ln -s libBasicUsageEnvironment.so.%{LIVE_ABI_VERSION} $RPM_BUILD_ROOT%{_livedir}/BasicUsageEnvironment/libBasicUsageEnvironment.so
 
 cd ..
 install %{SOURCE1} ChangeLog.txt
@@ -100,20 +117,28 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post   -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post libs   -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
-%dir %{_libdir}/liveMedia
-%dir %{_libdir}/liveMedia/UsageEnvironment
-%attr(755,root,root) %{_libdir}/liveMedia/UsageEnvironment/libUsageEnvironment.so
-%dir %{_libdir}/liveMedia/BasicUsageEnvironment
-%attr(755,root,root) %{_libdir}/liveMedia/BasicUsageEnvironment/libBasicUsageEnvironment.so
-%dir %{_libdir}/liveMedia/liveMedia
-%attr(755,root,root) %{_libdir}/liveMedia/liveMedia/libliveMedia.so
-%dir %{_libdir}/liveMedia/groupsock
-%attr(755,root,root) %{_libdir}/liveMedia/groupsock/libgroupsock.so
+%dir %{_livedir}
+%dir %{_livedir}/BasicUsageEnvironment
+%dir %{_livedir}/UsageEnvironment
+%dir %{_livedir}/groupsock
+%dir %{_livedir}/liveMedia
+
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_livedir}/BasicUsageEnvironment/libBasicUsageEnvironment.so.*
+%attr(755,root,root) %{_livedir}/UsageEnvironment/libUsageEnvironment.so.*
+%attr(755,root,root) %{_livedir}/groupsock/libgroupsock.so.*
+%attr(755,root,root) %{_livedir}/liveMedia/libliveMedia.so.*
+# Temporary:
+%attr(755,root,root) %{_livedir}/BasicUsageEnvironment/libBasicUsageEnvironment.so
+%attr(755,root,root) %{_livedir}/UsageEnvironment/libUsageEnvironment.so
+%attr(755,root,root) %{_livedir}/groupsock/libgroupsock.so
+%attr(755,root,root) %{_livedir}/liveMedia/libliveMedia.so
 
 %files devel
 %defattr(644,root,root,755)
@@ -122,10 +147,10 @@
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/liveMedia/BasicUsageEnvironment/libBasicUsageEnvironment.a
-%{_libdir}/liveMedia/UsageEnvironment/libUsageEnvironment.a
-%{_libdir}/liveMedia/groupsock/libgroupsock.a
-%{_libdir}/liveMedia/liveMedia/libliveMedia.a
+%{_livedir}/BasicUsageEnvironment/libBasicUsageEnvironment.a
+%{_livedir}/UsageEnvironment/libUsageEnvironment.a
+%{_livedir}/groupsock/libgroupsock.a
+%{_livedir}/liveMedia/libliveMedia.a
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -133,6 +158,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.51  2009/07/18 12:24:22  blues
+- cleanups
+
 Revision 1.50  2009/07/18 11:33:33  blues
 - missing epoch in requires
 
================================================================

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

More information about the pld-cvs-commit mailing list