X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=live.spec;h=0516d25f91dd455a10b1f7771fad1a1d1584a376;hb=7d248c7;hp=9be07e95932fc5dd9e03da0b58d3986c0bd3f0b7;hpb=18b35aaab17045abde09bdc76a9d26b95258871a;p=packages%2Flive.git

diff --git a/live.spec b/live.spec
index 9be07e9..0516d25 100644
--- a/live.spec
+++ b/live.spec
@@ -1,16 +1,22 @@
-Summary:	LIVE555 for streaming media
-Summary(pl.UTF-8):	LIVE555 do strumieni multimedialnych
+# TODO:
+# - mediaServer should have init-scripts, user, etc, etc...
+# - package test apps
+Summary:	LIVE555 streaming media server
+Summary(pl.UTF-8):	LIVE555 - serwer strumieni multimedialnych
 Name:		live
-Version:	2010.04.09
+Version:	2014.11.12
 Release:	2
 Epoch:		2
 License:	LGPL v2.1+
-Group:		Development/Libraries
+Group:		Applications/Multimedia
 Source0:	http://www.live555.com/liveMedia/public/%{name}.%{version}.tar.gz
-# Source0-md5:	7f56f54c1c4697764c6e88282e353e81
+# Source0-md5:	2e401cc9aa22d28795e48cc4ff1a4c89
 Source1:	http://www.live555.com/liveMedia/public/changelog.txt
-# Source1-md5:	9f962afca5e55ae76b84ad8cb365d805
+# Source1-md5:	74a80b58144dacd6d2e560c13484d0d7
 Source2:	%{name}-shared.config
+Patch0:		%{name}-link.patch
+# from debian
+Patch1:		%{name}-pkgconfig.patch
 URL:		http://www.live555.com/liveMedia/
 BuildRequires:	libstdc++-devel
 BuildRequires:	sed >= 4.0
@@ -22,25 +28,32 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 # Should be changed on every ABI change
 # Alexis Ballier <aballier@gentoo.org>:
 %define		LIVE_ABI_VERSION	1
+# circular symbol dependencies with libBasicUsageEnvironment
+%define		skip_post_check_so	.*%{_libdir}/libUsageEnvironment\.so.*
 
 %description
-LIVE555 for streaming media.
+LIVE555 streaming media server.
 
 %description -l pl.UTF-8
-LIVE555 do strumieni multimedialnych.
+LIVE555 - serwer strumieni multimedialnych.
 
 %package libs
 Summary:	Shared LIVE555 libraries for streaming media
-Group:		Development/Libraries
+Summary(pl.UTF-8):	Biblioteki współdzielone LIVE555 do strumieni multimedialnych
+Group:		Libraries
 
 %description libs
 Shared LIVE555 libraries for streaming media.
 
+%description libs -l pl.UTF-8
+Biblioteki współdzielone LIVE555 do strumieni multimedialnych.
+
 %package devel
 Summary:	Header files for developing programs using LIVE555
 Summary(pl.UTF-8):	Pliki nagłówkowe do biblioteki LIVE555
 Group:		Development/Libraries
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
+Requires:	libstdc++-devel
 Obsoletes:	live < 2:2009.07.09-2.5
 
 %description devel
@@ -50,22 +63,27 @@ Header files for developing programs using LIVE555.
 Pliki nagłówkowe do biblioteki LIVE555
 
 %package static
-Summary:	Static version LIVE555 library
-Summary(pl.UTF-8):	Biblioteka statyczna LIVE555
+Summary:	Static LIVE555 libraries for streaming media
+Summary(pl.UTF-8):	Biblioteki statyczne LIVE555 do strumieni multimedialnych
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
 
 %description static
-Static LIVE555 library.
+Static LIVE555 libraries for streaming media.
 
 %description static -l pl.UTF-8
-Statyczna biblioteka LIVE555.
+Biblioteki statyczne LIVE555 do strumieni multimedialnych.
 
 %prep
 %setup -q -c -n %{name}
+%patch0 -p0
+cd live
+%patch1 -p1
+cd ..
 install %{SOURCE2} %{name}/config.linux-shared
 cp -pPR %{name} %{name}-shared
 mv %{name} %{name}-static
+cp -af %{SOURCE1} ChangeLog.txt
 
 %build
 cd %{name}-static
@@ -74,7 +92,7 @@ sed -i -e 's#$(TESTPROGS_APP)##g' Makefile Makefile.tail
 %{__make} \
 	C_COMPILER="%{__cc}" \
 	CPLUSPLUS_COMPILER="%{__cxx}" \
-	COMPILE_OPTS="\$(INCLUDES) -I. %{rpmcppflags} %{rpmcflags} -DSOCKLEN_T=socklen_t -fPIC"
+	COMPILE_OPTS="\$(INCLUDES) -I. %{rpmcppflags} %{rpmcflags} -DSOCKLEN_T=socklen_t -DRTSPCLIENT_SYNCHRONOUS_INTERFACE=1 -fPIC"
 
 cd ../%{name}-shared
 ./genMakefiles linux-shared
@@ -83,36 +101,32 @@ sed -i -e 's#$(TESTPROGS_APP)##g' Makefile Makefile.tail
 	C_COMPILER="%{__cc}" \
 	CPLUSPLUS_COMPILER="%{__cxx}" \
 	LIB_SUFFIX="so.%{LIVE_ABI_VERSION}" \
-	COMPILE_OPTS="\$(INCLUDES) -I. %{rpmcppflags} %{rpmcflags} -DSOCKLEN_T=socklen_t"
+	COMPILE_OPTS="\$(INCLUDES) -I. %{rpmcppflags} %{rpmcflags} -DSOCKLEN_T=socklen_t -DRTSPCLIENT_SYNCHRONOUS_INTERFACE=1"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_libdir},%{_includedir}/liveMedia,%{_bindir}}
 
-cd %{name}-static
 for i in liveMedia groupsock UsageEnvironment BasicUsageEnvironment; do
-	install -p $i/lib$i.a $RPM_BUILD_ROOT%{_libdir}
-done
-
-cd ../%{name}-shared
-
-for i in liveMedia groupsock UsageEnvironment BasicUsageEnvironment; do
-	install -p $i/lib$i.so.%{LIVE_ABI_VERSION} $RPM_BUILD_ROOT%{_libdir}
+	install -p %{name}-static/$i/lib$i.a $RPM_BUILD_ROOT%{_libdir}
+	install -p %{name}-shared/$i/lib$i.so.%{LIVE_ABI_VERSION} $RPM_BUILD_ROOT%{_libdir}
 	ln -s lib$i.so.%{LIVE_ABI_VERSION} $RPM_BUILD_ROOT%{_libdir}/lib$i.so
-	install -p $i/include/* $RPM_BUILD_ROOT%{_includedir}/liveMedia
+	install -p %{name}-shared/$i/include/* $RPM_BUILD_ROOT%{_includedir}/liveMedia
 done
 
 # We provide shared version:
-install -p mediaServer/live555MediaServer $RPM_BUILD_ROOT%{_bindir}
+install -p %{name}-shared/mediaServer/live555MediaServer $RPM_BUILD_ROOT%{_bindir}
 
-cd ..
-cp -af %{SOURCE1} ChangeLog.txt
+# pc file
+%{__make} -C live-shared install_shared_libraries \
+	LIBDIR=%{_libdir} \
+	DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post libs   -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
+%post	libs -p /sbin/ldconfig
+%postun	libs -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
@@ -128,11 +142,12 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(644,root,root,755)
 %doc ChangeLog.txt
-%{_includedir}/liveMedia
 %attr(755,root,root) %{_libdir}/libBasicUsageEnvironment.so
 %attr(755,root,root) %{_libdir}/libUsageEnvironment.so
 %attr(755,root,root) %{_libdir}/libgroupsock.so
 %attr(755,root,root) %{_libdir}/libliveMedia.so
+%{_includedir}/liveMedia
+%{_pkgconfigdir}/live555.pc
 
 %files static
 %defattr(644,root,root,755)