packages: airvideo/airvideo.spec - up to 2.4.5 beta6, alpha6 jar - add avah...

[glen]

Author: glen                         Date: Tue Jan  3 10:24:04 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 2.4.5 beta6, alpha6 jar
- add avahi service
- let /var/lib/airvideo owned by root (not really needed the dir)

---- Files affected:
packages/airvideo:
   airvideo.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: packages/airvideo/airvideo.spec
diff -u packages/airvideo/airvideo.spec:1.5 packages/airvideo/airvideo.spec:1.6
--- packages/airvideo/airvideo.spec:1.5	Tue Jan  3 11:04:08 2012
+++ packages/airvideo/airvideo.spec	Tue Jan  3 11:23:58 2012
@@ -7,28 +7,28 @@
 %include	/usr/lib/rpm/macros.java
 Summary:	Air-Video Video Streaming Server
 Name:		airvideo
-Version:	2.2.5
-Release:	0.8
+Version:	2.4.5
+Release:	0.11
 License:	GPL v2+ with LGPL v2+ parts
 Group:		Applications/Multimedia
-Source0:	http://www.inmethod.com/air-video/download/ffmpeg-for-%{version}.tar.bz2
-# NoSource0-md5:	1623d51b433555e08d0c2fcf1dee1b55
+Source0:	http://inmethod.com/air-video/download/ffmpeg-for-%{version}-beta6.tar.bz2
+# NoSource0-md5:	241844e9d41bbd9f8852955291490910
 NoSource:	0
 Source1:	%{name}.init
-Source2:	http://inmethod.com/air-video/download/linux/alpha1/AirVideoServerLinux.jar
-# NoSource2-md5:	312d6dd45f6c9928e1570da67a6d8ee6
+Source2:	http://inmethod.com/air-video/download/linux/alpha6/AirVideoServerLinux.jar#/avs-alpha6.jar
+# NoSource2-md5:	b619c088eea230afa92181393a36e1c0
 NoSource:	2
 Source3:	test.properties
+Source4:	avs.avahi
 URL:		http://www.inmethod.com/air-video/
-BuildRequires:	faad2-devel
 BuildRequires:	lame-libs-devel
 BuildRequires:	libx264-devel >= 0.1.3
 BuildRequires:	pkgconfig
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.470
+Requires(post,preun):	/sbin/chkconfig
 Requires:	faac
 Requires:	jpackage-utils
-Requires(post,preun):	/sbin/chkconfig
 Requires:	mpeg4ip-server
 Requires:	rc-scripts
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -49,9 +49,19 @@
 and iPod touch. You don't need to copy your videos to the device just
 to watch them.
 
+%package avahi
+Summary:	airvideo service configuration for avahi
+Summary(pl.UTF-8):	Konfiguracja serwisu airvideo dla avahi
+Group:		Applications
+Requires:	%{name} = %{version}-%{release}
+Requires:	avahi
+
+%description avahi
+airvideo service configuration for avahi.
+
 %prep
 %setup -qc
-mv ffmpeg/* .; rmdir ffmpeg
+mv ffmpeg/{*,.??*} .; rmdir ffmpeg
 
 %build
 # notes:
@@ -76,7 +86,6 @@
 	--enable-gpl \
 	--enable-libx264 \
 	--enable-libmp3lame \
-	--enable-libfaad \
 	--disable-decoder=aac \
 	--disable-indevs \
 	--disable-outdevs \
@@ -93,12 +102,13 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_sbindir},%{_javadir},/etc/rc.d/init.d,/var/lib/airvideo}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_sbindir},%{_javadir},/etc/{rc.d/init.d,avahi/services},/var/lib/airvideo}
 install -p ffmpeg $RPM_BUILD_ROOT%{_sbindir}/%{name}
 install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 
-cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_javadir}
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_javadir}/AirVideoServerLinux.jar
 cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.properties
+cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/avahi/services/%{name}.service
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -120,7 +130,11 @@
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
 %{_javadir}/AirVideoServerLinux.jar
 # XXX, if it really writes something, get dedicated user
-%dir %attr(755,nobody,nobody) /var/lib/airvideo
+%dir /var/lib/airvideo
+
+%files avahi
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/avahi/services/%{name}.service
 
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -128,6 +142,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2012/01/03 10:23:58  glen
+- up to 2.4.5 beta6, alpha6 jar
+- add avahi service
+- let /var/lib/airvideo owned by root (not really needed the dir)
+
 Revision 1.5  2012/01/03 10:04:08  glen
 - save test.properties locally
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/airvideo/airvideo.spec?r1=1.5&r2=1.6&f=u