[svn] r5245 - trunk/rpms/kino

[packagers at lists.rpmforge.net]

Author: thias
Date: 2007-03-26 19:37:16 +0200 (Mon, 26 Mar 2007)
New Revision: 5245

Added:
   trunk/rpms/kino/kino-1.0.0-install.patch
Modified:
   trunk/rpms/kino/kino.spec
Log:
Update kino to 1.0.0.


Added: trunk/rpms/kino/kino-1.0.0-install.patch
===================================================================
--- trunk/rpms/kino/kino-1.0.0-install.patch	                        (rev 0)
+++ trunk/rpms/kino/kino-1.0.0-install.patch	2007-03-26 17:37:16 UTC (rev 5245)
@@ -0,0 +1,24 @@
+diff -Naupr kino-1.0.0.orig/src/Makefile.am kino-1.0.0/src/Makefile.am
+--- kino-1.0.0.orig/src/Makefile.am	2007-03-08 07:47:57.000000000 +0100
++++ kino-1.0.0/src/Makefile.am	2007-03-26 19:27:45.000000000 +0200
+@@ -118,7 +118,7 @@ pretty:
+ 	astyle $(ASTYLEFLAGS) $(kino_SOURCES)
+ 
+ install-exec-local:
+-	ln -sf $(DESTDIR)$(bindir)/kino $(DESTDIR)$(bindir)/kino2raw
++	ln -sf kino $(DESTDIR)$(bindir)/kino2raw
+ 
+ uninstall-local:
+ 	rm $(DESTDIR)$(bindir)/kino2raw
+diff -Naupr kino-1.0.0.orig/src/Makefile.in kino-1.0.0/src/Makefile.in
+--- kino-1.0.0.orig/src/Makefile.in	2007-03-08 07:48:40.000000000 +0100
++++ kino-1.0.0/src/Makefile.in	2007-03-26 19:27:54.000000000 +0200
+@@ -926,7 +926,7 @@ pretty:
+ 	astyle $(ASTYLEFLAGS) $(kino_SOURCES)
+ 
+ install-exec-local:
+-	ln -sf $(DESTDIR)$(bindir)/kino $(DESTDIR)$(bindir)/kino2raw
++	ln -sf kino $(DESTDIR)$(bindir)/kino2raw
+ 
+ uninstall-local:
+ 	rm $(DESTDIR)$(bindir)/kino2raw

Modified: trunk/rpms/kino/kino.spec
===================================================================
--- trunk/rpms/kino/kino.spec	2007-03-26 14:18:22 UTC (rev 5244)
+++ trunk/rpms/kino/kino.spec	2007-03-26 17:37:16 UTC (rev 5245)
@@ -10,19 +10,19 @@
 %{?fc6:  %define _with_modxorg 1}
 %{?fc5:  %define _with_modxorg 1}
 
-#define cvs 20060320
-
 Summary: Simple non-linear video editor
 Name: kino
-Version: 0.9.5
-Release: 1%{?cvs:.%{cvs}}
+Version: 1.0.0
+Release: 1
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.kinodv.org/
-Source: http://dl.sf.net/kino/kino-%{version}.tar.gz
+Source: http://downloads.sf.net/kino/kino-%{version}.tar.gz
+Patch0: kino-1.0.0-install.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: gtk2 >= 2.6
 Requires: mjpegtools
+%{?_with_extffmpeg:Requires: ffmpeg}
 BuildRequires: libdv-devel >= 0.102
 BuildRequires: libavc1394-devel, libraw1394-devel, libiec61883-devel
 BuildRequires: libogg-devel, libvorbis-devel, a52dec-devel
@@ -32,7 +32,7 @@
 # libtool *sigh*
 BuildRequires: gcc-c++
 %{!?_without_quicktime:BuildRequires: libquicktime-devel}
-%{!?_without_ffmpeg:BuildRequires: ffmpeg-devel}
+%{?_with_extffmpeg:BuildRequires: ffmpeg-devel}
 Obsoletes: kino-devel <= %{version}
 Obsoletes: kino-dvtitler <= 0.2.0-2
 
@@ -45,23 +45,20 @@
 
 %prep
 %setup
+%patch0 -p1 -b .install
 
 
 %build
 %configure \
     --disable-static \
-    --with-hotplug-script-dir=%{_sysconfdir}/hotplug/usb \
-    --with-hotplug-usermap-dir=%{_libdir}/hotplug/kino \
     %{!?_without_quicktime:--enable-quicktime} \
-    %{!?_without_ffmpeg:--with-avcodec}
+    %{?_with_extffmpeg:--enable-local-ffmpeg=no}
 %{__make} %{?_smp_mflags}
 
 
 %install
 %{__rm} -rf %{buildroot}
-%makeinstall \
-    hotplugscriptdir=%{buildroot}%{_sysconfdir}/hotplug/usb \
-    hotplugusermapdir=%{buildroot}%{_libdir}/hotplug/kino
+%makeinstall 
 %find_lang %{name}
 # Move plugins back where they belong (new in 0.8.0)
 %{__mkdir_p} %{buildroot}%{_libdir}/kino-gtk2/
@@ -82,10 +79,9 @@
 %files -f %{name}.lang
 %defattr(-, root, root, 0755)
 %doc AUTHORS BUGS ChangeLog COPYING NEWS README*
-%config %{_sysconfdir}/hotplug/usb/*
+%config %{_sysconfdir}/udev/rules.d/kino.rules
 %{_bindir}/*
 %{_includedir}/kino/
-%{_libdir}/hotplug/kino/
 %dir %{_libdir}/kino-gtk2/
 %{_libdir}/kino-gtk2/*.so*
 %exclude %{_libdir}/kino-gtk2/*.la
@@ -97,6 +93,12 @@
 
 
 %changelog
+* Mon Mar 26 2007 Matthias Saou <http://freshrpms.net/> 1.0.0-1
+- Update to 1.0.0.
+- Use the internal ffmpeg snapshot, make _with_extffmpeg a build time option.
+- Remove no longer shipped hotplug files, replace with new udev rules file.
+- Include patch to fix absolute (DESTDIR + bindir) symlink.
+
 * Tue Jan 16 2007 Matthias Saou <http://freshrpms.net/> 0.9.5-1
 - Update to 0.9.5.