- up to 2.4.5 beta6, alpha6 jar

- add avahi service
- let /var/lib/airvideo owned by root (not really needed the dir)

Changed files:
    airvideo.spec -> 1.6

diff --git a/airvideo.spec b/airvideo.spec
index 61d13e7acb89faa5f622fbc53ad9b6b2298fb884..f9e50968f0e4c9e4c9da33c67629f75761fe91be 100644 (file)
--- a/airvideo.spec
+++ b/airvideo.spec
@@ -6,28 +6,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)
@@ -48,9 +48,19 @@ Air Video can stream videos in almost any format to your iPhone, iPad
 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:
@@ -75,7 +85,6 @@ mv ffmpeg/* .; rmdir ffmpeg
        --enable-gpl \
        --enable-libx264 \
        --enable-libmp3lame \
-       --enable-libfaad \
        --disable-decoder=aac \
        --disable-indevs \
        --disable-outdevs \
@@ -92,12 +101,13 @@ mv ffmpeg/* .; rmdir ffmpeg
 
 %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
@@ -119,4 +129,8 @@ fi
 %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