Packman Build Service PMBS

Changes of Revision 3

xvidcap.changes Added

@@ -0,0 +1,36 @@
+-------------------------------------------------------------------
+Fri Nov 18 23:18:56 UTC 2011 - pascal.bleser@opensuse.org
+
+- modernize spec file
+- fix linking on 12.1/Factory
+
+-------------------------------------------------------------------
+Mon Nov 23 00:00:00 UTC 2009 - detlef@links2linux.de
+
+- set asneeded=0 for 11.2
+
+-------------------------------------------------------------------
+Fri Oct  3 00:00:00 UTC 2008 - detlef@links2linux.de
+
+- fix mandir
+
+-------------------------------------------------------------------
+Mon Jul 14 00:00:00 UTC 2008 - detlef@links2linux.de
+
+- new upstream version <1.1.7>
+
+-------------------------------------------------------------------
+Mon Feb 18 00:00:00 UTC 2008 - detlef@links2linux.de
+
+- new upstream version <1.1.7rc1>
+
+-------------------------------------------------------------------
+Sun Nov 18 00:00:00 UTC 2007 - detlef@links2linux.de
+
+- new upstream release <1.1.6>
+
+-------------------------------------------------------------------
+Mon Oct  2 00:00:00 UTC 2006 - detlef@links2linux.de
+
+- first build for packman
+

xvidcap.spec Changed

@@ -1,22 +1,26 @@
-# norootforbuild
+# vim: set ts=4 sw=4 et:
 
-Name:       xvidcap
-Version:    1.1.7
-Release:    4
-Summary:    A small tool to capture things going on on an X-Windows display
-URL:        http://xvidcap.sourceforge.net/
-Group:      Productivity/Graphics/Viewers
-License:    GPL
+Name:           xvidcap
+Version:        1.1.7
+Release:        4
+Summary:        A small tool to capture things going on on an X-Windows display
+URL:            http://xvidcap.sourceforge.net/
+Group:          Productivity/Graphics/Viewers
+License:        GNU General Public License version 2 or later (GPLv2 or later)
 
-Source0:    http://prdownloads.sourceforge.net/xvidcap/%{name}-%{version}.tar.gz
+Source0:        http://prdownloads.sourceforge.net/xvidcap/%{name}-%{version}.tar.gz
 
-Patch0:     xvidcap-1.1.6-docdir.patch
-Patch1:     xvidcap-xorg.patch
+Patch0:         xvidcap-1.1.6-docdir.patch
+Patch1:         xvidcap-xorg.patch
+Patch2:         xvidcap-fix_linking.patch
 
-BuildRoot:  %{_tmppath}/build-%{name}-%{version}
+BuildRoot:      %{_tmppath}/build-%{name}-%{version}
 
-BuildRequires: gtk2-devel libmp3lame-devel libglade2-devel perl-XML-Parser pkgconfig scrollkeeper update-desktop-files
+BuildRequires:  gtk2-devel libmp3lame-devel libglade2-devel perl-XML-Parser pkgconfig scrollkeeper update-desktop-files
 
+%if 0%{?suse_version} >= 1030
+BuildRequires:  fdupes
+%endif
 
 %description
 Xvidcap is a tool that can capture movement on an X11 display. It works in two distinct modes:
@@ -25,40 +29,40 @@
 It is intended to be a standards-based alternative to tools like Lotus ScreenCam for UNIX platforms.
 On-line encoding is done through FFMPEG and also allows for audio grabbing on OSS compatible systems.
 
-Author: Karl H. Beckers
-
-
-
-
-
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p 1
 %if %suse_version >= 1130
 %patch1 -p 1
 %endif
-
+%patch2
 
 %build
 export SUSE_ASNEEDED=0
+%if 0%{?suse_version} < 1000
 export LDFLAGS="-L/usr/X11R6/%{_lib}"
+%endif
 %configure --with-forced-embedded-ffmpeg
-%__make  %{?jobs:-j%{jobs}}
-
+%__make %{?_smp_flags}
 
 %install
 %makeinstall
 
-%suse_update_desktop_file %{name} AudioVideo Recorder
+%__rm -rf "%{buildroot}%{_datadir}/gnome/help"
+
+%suse_update_desktop_file -r %{name} AudioVideo Recorder
 
-%find_lang "%{name}"
+%if 0%{?suse_version} >= 1030
+%fdupes -s "%{buildroot}%{_datadir}/"
+%endif
 
+%find_lang "%{name}" --with-man
+%find_lang "%{name}-dbus-client" --with-man
 
 %clean
-%__rm -rf "%{buildroot}"
-
+%{?buildroot:%__rm -rf "%{buildroot}"}
 
-%files -f "%{name}.lang"
+%files -f "%{name}.lang" -f "%{name}-dbus-client.lang"
 %defattr(-,root,root)
 %{_bindir}/xvidcap
 %{_datadir}/applications/%{name}.desktop
@@ -72,25 +76,6 @@
 %{_datadir}/pixmaps/*.png
 %dir %{_docdir}/%{name}
 %{_docdir}/%{name}/*
-%{_mandir}/man1/*
-%{_mandir}/de/man1/*
-%{_mandir}/es/man1/*
-%{_mandir}/it/man1/*
-# WTF?
-%dir %{_datadir}/gnome
-%dir %{_datadir}/gnome/help
-
+%doc %{_mandir}/man1/*
 
 %changelog
-* Mon Nov 23 2009 Detlef Reichelt <detlef@links2linux.de> 0.1.7-2
-- set asneeded=0 for 11.2
-* Fri Oct 03 2008 Detlef Reichelt <detlef@links2linux.de> <0.1.7>-<0.pm.2>
-- fix mandir
-* Mon Jul 14 2008 Detlef Reichelt <detlef@links2linux.de> <0.1.7>-<0.pm.1>
-- new upstream version <1.1.7>
-* Mon Feb 18 2008 Detlef Reichelt <detlef@links2linux.de> <0.1.7rc1>-<0.pm.1>
-- new upstream version <1.1.7rc1>
-* Sun Nov 18 2007 Detlef Reichelt <detlef@links2linux.de> <0.1.6>
-- new upstream release <1.1.6>
-* Mon Oct 02 2006 Detlef Reichelt <detlef@links2linux.de> <0.1.4rc1>
-- first build for packman

xvidcap-fix_linking.patch Added

@@ -0,0 +1,38 @@
+--- src/Makefile.am.orig	2011-11-14 23:10:53.406000898 +0100
++++ src/Makefile.am	2011-11-14 23:12:02.714000890 +0100
+@@ -12,7 +12,6 @@
+ 
+ AM_CFLAGS =\
+ 	 -Wall\
+-	 -g \
+ 	 -DDBUS_SERVICE_DIR=\""$(datadir)/dbus-1/service"\"
+ #	 -DDEBUG -DDEBUG2
+ 
+@@ -54,7 +53,7 @@
+         eggtrayicon.h \
+         eggtrayicon.c
+ 
+-xvidcap_LDADD = $(PACKAGE_LIBS)
++xvidcap_LDADD = $(PACKAGE_LIBS) -lX11 -lXext -lz
+ 
+ if SOLARIS
+ xvidcap_LDFLAGS = 
+--- src/Makefile.in.orig	2011-11-14 23:12:16.174000836 +0100
++++ src/Makefile.in	2011-11-14 23:12:30.551000896 +0100
+@@ -279,7 +279,6 @@
+ 
+ AM_CFLAGS = \
+ 	 -Wall\
+-	 -g \
+ 	 -DDBUS_SERVICE_DIR=\""$(datadir)/dbus-1/service"\"
+ 
+ xvidcap_SOURCES = app_data.c app_data.h capture.c capture.h codecs.c \
+@@ -290,7 +289,7 @@
+ 	xtoxwd.c xtoxwd.h job.c job.h xvc_error_item.c \
+ 	xvc_error_item.h xvidcap-intl.h eggtrayicon.h eggtrayicon.c \
+ 	$(am__append_2)
+-xvidcap_LDADD = $(PACKAGE_LIBS) $(am__append_1)
++xvidcap_LDADD = $(PACKAGE_LIBS) $(am__append_1) -lX11 -lXext -lz
+ @SOLARIS_FALSE@xvidcap_LDFLAGS = -export-dynamic
+ @SOLARIS_TRUE@xvidcap_LDFLAGS = 
+ EXTRA_DIST = $(glade_DATA) $(am__append_4)