Changeset 1175:13a3c66dd596 in mediastreamer2

Timestamp:

Oct 18, 2010 10:31:09 PM (3 years ago)

Author:

Simon Morlat <simon.morlat@…>

Branch:

default

Message:

improve specfile

Files:

• Makefile.am (modified) (1 diff)
• mediastreamer2.spec.in (modified) (4 diffs)

Makefile.am

@@ -17 +17 @@
 # <https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=206841>
         TAR_OPTIONS=--wildcards rpmbuild -ta --clean --rmsource --rmspec $(PACKAGE)-$(VERSION).tar.gz
+
+rpm-novideo:
+        $(MAKE) dist
+# <https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=206841>
+        TAR_OPTIONS=--wildcards rpmbuild -ta --clean --rmsource --rmspec --without video $(PACKAGE)-$(VERSION).tar.gz 
+
 
 # `make package'

mediastreamer2.spec.in

@@ -1 +1 @@
 # -*- rpm-spec -*-
 # 
-# mediastreamer2 -- A mediastreaming library for telephony applications
+# mediastreamer2 -- A media streaming library for telephony applications
 # 
 
@@ -47 +47 @@
 %define mediastreamer2_cflags %mediastreamer2_arch_cflags -Wall -g -pipe -pthread -O3 -fomit-frame-pointer -fno-schedule-insns -fschedule-insns2 -fstrict-aliasing
 
+
+%define opt_with() %{expand:%%global with_%{1} %%{?_with_%{1}:1}%%{?!_with_%{1}:0}}
+%define opt_without() %{expand:%%global with_%{1} %%{!?_without_%{1}:1}%%{?_without_%{1}:0}}
+
+%opt_with video       - build with video features
+
+%define have_video %{?_with_video:1}%{!?_with_video:0}
+
 %prep
 %setup -q
 
 %build
-%configure \
---enable-gtk-doc=no \
---enable-shared --enable-static
+options="--enable-shared --enable-static"
+%if !%{have_video}
+options="$options --disable-video"
+%endif
+
+%configure $options
+        
 make -j$RPM_BUILD_NCPUS CFLAGS="%mediastreamer2_cflags" CXXFLAGS="%mediastreamer2_cflags"
 
@@ -65 +77 @@
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
+%doc AUTHORS COPYING ChangeLog INSTALL NEWS README
 %{_libdir}/*.so.*
+/usr/share/images/nowebcamCIF.jpg
+%{_libexecdir}
 
 %files devel
 %defattr(-,root,root,-)
-%doc docs/html
 %{_libdir}/*.la
 %{_libdir}/*.a
@@ -76 +89 @@
 %{_libdir}/pkgconfig/*.pc
 %{_includedir}
+%{_docdir}
 
 %changelog