rpms/x264/F-9 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 x264.desktop, 1.1, 1.2 x264.spec, 1.1, 1.2

[Dominik Mierzejewski]

Author: rathann

Update of /cvs/free/rpms/x264/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9812

Modified Files:
	.cvsignore sources x264.desktop x264.spec 
Log Message:
* Sun Feb 08 2009 Dominik Mierzejewski <rpm at greysector.net> 0.0.0-0.16.20080613
- fix build with --with gpac
- drop gui-devel subpackage



Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/x264/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 Aug 2008 18:26:46 -0000	1.2
+++ .cvsignore	10 Feb 2009 22:19:01 -0000	1.3
@@ -1 +1,2 @@
 x264-20080613.tar.bz2
+x264icon.png


Index: sources
===================================================================
RCS file: /cvs/free/rpms/x264/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Aug 2008 18:26:46 -0000	1.2
+++ sources	10 Feb 2009 22:19:01 -0000	1.3
@@ -1 +1,2 @@
 265f24d6f91d5ba0b448ed63c59d03fb  x264-20080613.tar.bz2
+47946ad85c1f8be7397f328787468aad  x264icon.png


Index: x264.desktop
===================================================================
RCS file: /cvs/free/rpms/x264/F-9/x264.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- x264.desktop	4 Aug 2008 18:26:46 -0000	1.1
+++ x264.desktop	10 Feb 2009 22:19:01 -0000	1.2
@@ -4,7 +4,7 @@
 Comment=Gtk+ interface to configure X264
 Exec=x264_gtk_encode
 Terminal=false
-Icon=x264.png
+Icon=x264
 Type=Application
 Encoding=UTF-8
 Categories=Video;AudioVideoEditing;GTK;


Index: x264.spec
===================================================================
RCS file: /cvs/free/rpms/x264/F-9/x264.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- x264.spec	4 Aug 2008 18:26:46 -0000	1.1
+++ x264.spec	10 Feb 2009 22:19:01 -0000	1.2
@@ -3,21 +3,23 @@
 Summary: H264/AVC video streams encoder
 Name: x264
 Version: 0.0.0
-Release: 0.15.%{snapshot}%{?dist}
+Release: 0.16.%{snapshot}%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://developers.videolan.org/x264.html
 Source0: http://rpm.greysector.net/livna/%{name}-%{snapshot}.tar.bz2
 Source1: x264-snapshot.sh
 Source2: %{name}.desktop
+# converted from gtk/x264.ico and made background transparent
+Source3: %{name}icon.png
 Patch0: %{name}-rpm.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
 BuildRequires: desktop-file-utils
 # version.sh requires git
 BuildRequires: git-core
+%{?_with_gpac:BuildRequires: gpac-devel}
 BuildRequires: gtk2-devel
 BuildRequires: gettext
-BuildRequires: ImageMagick
 %ifarch %{ix86}
 BuildRequires: nasm
 %endif
@@ -60,6 +62,7 @@
 Requires(postun): /sbin/ldconfig
 Obsoletes: %{name}-gtk < %{version}-%{release}
 Provides: %{name}-gtk = %{version}-%{release}
+Obsoletes: %{name}-gui-devel < 0.0.0-0.16
 
 %description gui
 x264 is a free library for encoding H264/AVC video streams, written from
@@ -67,21 +70,6 @@
 
 This package contains the GTK GUI.
 
-%package gui-devel
-Summary: Development files for the x264 encoder GUI
-Group: Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}
-Requires: %{name}-gui = %{version}-%{release}
-Requires: pkgconfig
-Obsoletes: %{name}-gtk-devel < %{version}-%{release}
-Provides: %{name}-gtk-devel = %{version}-%{release}
-
-%description gui-devel
-x264 is a free library for encoding H264/AVC video streams, written from
-scratch.
-
-This package contains the GUI development files.
-
 %prep
 %setup -q -n %{name}-%{snapshot}
 %patch0 -p1 -b .r
@@ -91,7 +79,6 @@
 # configure hardcodes X11 lib path
 %{__perl} -pi -e 's|/usr/X11R6/lib |%{_libdir} |g' configure
 %{__perl} -pi -e 's|^MACHINE=.*|MACHINE=%{_build}|' configure
-convert gtk/x264.ico x264icon.png
 
 %build
 ./configure \
@@ -120,10 +107,11 @@
 	--mode 644					\
 	%{SOURCE2}
 
-%{__install} -Dpm 644 x264icon.png \
+%{__install} -Dpm 644 %{SOURCE3} \
 	%{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 
 %find_lang %{name}_gtk
+rm %{buildroot}{%{_includedir}/x264_gtk*.h,%{_libdir}/{libx264gtk.so,pkgconfig/%{name}gtk.pc}}
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -170,13 +158,11 @@
 %{_datadir}/applications/*%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/x264.png
 
-%files gui-devel
-%defattr(644, root, root, 0755)
-%{_includedir}/x264_gtk*.h
-%{_libdir}/libx264gtk.so
-%{_libdir}/pkgconfig/%{name}gtk.pc
-
 %changelog
+* Sun Feb 08 2009 Dominik Mierzejewski <rpm at greysector.net> 0.0.0-0.16.20080613
+- fix build with --with gpac
+- drop gui-devel subpackage
+
 * Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.0.0-0.15.20080613
 - rebuild