Author: qboosh Date: Sun Jan 15 19:55:13 2012 GMT Module: packages Tag: HEAD ---- Log message: - new URLs, updated to 2.2.14 - added install patch - removed obsolete link patch
---- Files affected: packages/xosd: xosd.spec (1.69 -> 1.70) , xosd-install.patch (NONE -> 1.1) (NEW), xosd-link.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/xosd/xosd.spec diff -u packages/xosd/xosd.spec:1.69 packages/xosd/xosd.spec:1.70 --- packages/xosd/xosd.spec:1.69 Tue Nov 11 16:03:27 2008 +++ packages/xosd/xosd.spec Sun Jan 15 20:55:08 2012 @@ -1,4 +1,5 @@ # $Revision$, $Date$ +# TODO: bmp plugin? # # Conditional build: %bcond_without static_libs # don't build static libraries @@ -8,27 +9,28 @@ Summary(es.UTF-8): Subtítulos (como en la tele) para X11 Summary(pl.UTF-8): Wyświetlanie napisów na ekranie podobnie jak w telewizorach (OSD) Name: xosd -Version: 2.2.12 -Release: 7 +Version: 2.2.14 +Release: 1 License: GPL v2+ Group: X11/Applications -Source0: http://www.ignavus.net/%{name}-%{version}.tar.bz2 -# Source0-md5: 756d714cec908e4d4c956ff0e7dcd4c4 +Source0: http://downloads.sourceforge.net/libxosd/%{name}-%{version}.tar.gz +# Source0-md5: 4b349fe930e4eee2f504d6c02673e24d Patch0: %{name}-am18.patch -Patch1: %{name}-link.patch -Patch2: %{name}-ac.patch -URL: http://www.ignavus.net/software.html +Patch1: %{name}-ac.patch +Patch2: %{name}-install.patch +URL: http://sourceforge.net/projects/libxosd/ BuildRequires: autoconf >= 2.59-9 BuildRequires: automake BuildRequires: libtool -BuildRequires: xorg-lib-libXext-devel -BuildRequires: xorg-lib-libXinerama-devel %if %{with xmms} BuildRequires: gdk-pixbuf-devel >= 0.22.0 BuildRequires: gtk+-devel >= 1.2.2 BuildRequires: rpmbuild(macros) >= 1.125 BuildRequires: xmms-devel >= 1.2.7 %endif +BuildRequires: xorg-lib-libX11-devel +BuildRequires: xorg-lib-libXext-devel +BuildRequires: xorg-lib-libXinerama-devel Obsoletes: libxosd2 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -109,8 +111,8 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p0 +%patch1 -p0 +%patch2 -p1 %build %{!?with_xmms:echo 'AC_DEFUN([AM_PATH_XMMS],[])' >> acinclude.m4} @@ -134,7 +136,7 @@ DESTDIR=$RPM_BUILD_ROOT \ m4datadir=%{_aclocaldir} -rm -f $RPM_BUILD_ROOT%{xmms_general_plugindir}/*.la +%{__rm} $RPM_BUILD_ROOT%{xmms_general_plugindir}/*.la %clean rm -rf $RPM_BUILD_ROOT @@ -147,16 +149,17 @@ %doc ChangeLog AUTHORS README %attr(755,root,root) %{_bindir}/osd_cat %attr(755,root,root) %{_libdir}/libxosd.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libxosd.so.2 %{_mandir}/man1/osd_cat.1* %files devel %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/xosd-config -%attr(755,root,root) %{_libdir}/*.so -%{_libdir}/*.la -%{_includedir}/*.h +%attr(755,root,root) %{_libdir}/libxosd.so +%{_libdir}/libxosd.la +%{_includedir}/xosd.h %{_aclocaldir}/libxosd.m4 -%{_mandir}/man3/*.3* +%{_mandir}/man3/xosd*.3* %{_mandir}/man1/xosd-config.1* %if %{with static_libs} @@ -168,7 +171,7 @@ %if %{with xmms} %files -n xmms-general-xosd %defattr(644,root,root,755) -%attr(755,root,root) %{xmms_general_plugindir}/libxmms_osd*.so* +%attr(755,root,root) %{xmms_general_plugindir}/libxmms_osd.so %dir %{_datadir}/xosd %{_datadir}/xosd/*.png %endif @@ -179,6 +182,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.70 2012/01/15 19:55:08 qboosh +- new URLs, updated to 2.2.14 +- added install patch +- removed obsolete link patch + Revision 1.69 2008/11/11 15:03:27 arekm - rel 7; fix build with new libtool ================================================================ Index: packages/xosd/xosd-install.patch diff -u /dev/null packages/xosd/xosd-install.patch:1.1 --- /dev/null Sun Jan 15 20:55:13 2012 +++ packages/xosd/xosd-install.patch Sun Jan 15 20:55:08 2012 @@ -0,0 +1,11 @@ +--- xosd-2.2.14/man/Makefile.am.orig 2004-08-20 00:39:38.000000000 +0200 ++++ xosd-2.2.14/man/Makefile.am 2012-01-15 19:26:10.560735517 +0100 +@@ -3,7 +3,7 @@ + xosd_display.3 xosd_hide.3 xosd_is_onscreen.3 xosd_set_vertical_offset.3 \ + xosd_set_pos.3 xosd_set_shadow_offset.3 xosd_show.3 xosd_uninit.3 xosd.3 \ + xosd_get_number_lines.3 xosd_set_align.3 xosd_create.3 \ +- xosd_set_horizontal_offset.3 xosd_destroy.3 xosd_create.3 xosd_is_onscreen.3 \ ++ xosd_set_horizontal_offset.3 xosd_destroy.3 \ + xosd_set_bar_length.3 + + EXTRA_DIST = ${man_MANS} ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xosd/xosd.spec?r1=1.69&r2=1.70&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
