- build shared and static version

Changed files:
    live-shared.config -> 1.1
    live.spec -> 1.49

diff --git a/live-shared.config b/live-shared.config
new file mode 100644 (file)
index 0000000..4835fcb
--- /dev/null
+++ b/live-shared.config
@@ -0,0 +1,17 @@
+COMPILE_OPTS =         $(INCLUDES) -I. -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
+C =                    c
+C_COMPILER =           $(CC)
+C_FLAGS =              $(COMPILE_OPTS) -fPIC $(CFLAGS)
+CPP =                  cpp
+CPLUSPLUS_COMPILER =   $(CXX)
+CPLUSPLUS_FLAGS =      $(COMPILE_OPTS) -fPIC $(CXXFLAGS)
+OBJ =                  o
+LINK =                 $(CXX) -o
+LINK_OPTS =            -L.
+CONSOLE_LINK_OPTS =    $(LINK_OPTS)
+LIBRARY_LINK =         $(CC) -o
+LIBRARY_LINK_OPTS =    $(LINK_OPTS) -shared -Wl,-soname,$@
+LIB_SUFFIX =                   so
+LIBS_FOR_CONSOLE_APPLICATION =
+LIBS_FOR_GUI_APPLICATION =
+EXE =

diff --git a/live.spec b/live.spec
index ecd15f80651a228917da0df51921f4c5ab82573c..51eb637ba5da34da7c1acae7be5535f3905d0d50 100644 (file)
--- a/live.spec
+++ b/live.spec
@@ -2,7 +2,7 @@ Summary:        LIVE555 libraries for streaming media
 Summary(pl.UTF-8):     Biblioteki LIVE555 do strumieni multimedialnych
 Name:          live
 Version:       2009.07.09
-Release:       2
+Release:       2.5
 Epoch:         2
 License:       LGPL v2.1+
 Group:         Development/Libraries
@@ -10,6 +10,7 @@ Source0:      http://www.live555.com/liveMedia/public/%{name}.%{version}.tar.gz
 # Source0-md5: 8085b7f75e55c91f15e96f375c80b9fb
 Source1:       http://www.live555.com/liveMedia/public/changelog.txt
 # Source1-md5: 9f962afca5e55ae76b84ad8cb365d805
+Source2:       %{name}-shared.config
 URL:           http://www.live555.com/liveMedia/
 BuildRequires: libstdc++-devel
 BuildRequires: sed >= 4.0
@@ -23,10 +24,38 @@ LIVE555 libraries for streaming media.
 %description -l pl.UTF-8
 Biblioteki LIVE555 do strumieni multimedialnych.
 
-%prep
-%setup -q -n live
+%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} = %{version}-%{release}
+
+%description devel
+Header files for developing programs using LIVE555.
+
+%description devel -l pl.UTF-8
+Pliki nagłówkowe do biblioteki LIVE555
+
+%package static
+Summary:        Static version LIVE555 library
+Summary(pl.UTF-8):      Biblioteka statyczna LIVE555
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description static
+Static LIVE555 library.
+
+%description static -l pl.UTF-8
+Statyczna biblioteka LIVE555.
+
+%prep 
+%setup -q -c -n %{name}
+install %{SOURCE2} %{name}/config.linux-shared
+cp -pPR %{name} %{name}-shared
+mv %{name} %{name}-static
 
 %build
+cd %{name}-static
 ./genMakefiles linux
 sed -i -e 's#$(TESTPROGS_APP)##g' Makefile Makefile.tail
 %{__make} \
@@ -34,11 +63,20 @@ sed -i -e 's#$(TESTPROGS_APP)##g' Makefile Makefile.tail
        CPLUSPLUS_COMPILER="%{__cxx}" \
        COMPILE_OPTS="\$(INCLUDES) -I. %{rpmcflags} -DSOCKLEN_T=socklen_t -fPIC"
 
+cd ../%{name}-shared
+./genMakefiles linux-shared
+sed -i -e 's#$(TESTPROGS_APP)##g' Makefile Makefile.tail
+%{__make} \
+       C_COMPILER="%{__cc}" \
+       CPLUSPLUS_COMPILER="%{__cxx}" \
+       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} \
        $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
@@ -49,13 +87,41 @@ install UsageEnvironment/include/* $RPM_BUILD_ROOT%{_includedir}/liveMedia
 install BasicUsageEnvironment/include/* $RPM_BUILD_ROOT%{_includedir}/liveMedia
 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
+
+cd ..
 install %{SOURCE1} ChangeLog.txt
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post   -p /sbin/ldconfig
+%postun -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
+
+%files devel
+%defattr(644,root,root,755)
 %doc ChangeLog.txt
-%{_libdir}/liveMedia
 %{_includedir}/liveMedia
+
+%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