SPECS (AC-branch): xfce4-panel.spec - 4.2.3, HEAD merge

havner havner at pld-linux.org
Wed Jul 5 11:19:05 CEST 2006 

Author: havner                       Date: Wed Jul  5 09:19:05 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- 4.2.3, HEAD merge

---- Files affected:
SPECS:
   xfce4-panel.spec (1.47 -> 1.47.2.1) 

---- Diffs:

================================================================
Index: SPECS/xfce4-panel.spec
diff -u SPECS/xfce4-panel.spec:1.47 SPECS/xfce4-panel.spec:1.47.2.1
--- SPECS/xfce4-panel.spec:1.47	Sat Apr  2 23:43:00 2005
+++ SPECS/xfce4-panel.spec	Wed Jul  5 11:18:59 2006
@@ -5,16 +5,20 @@
 Summary:	Next generation panel for Xfce
 Summary(pl):	Panel nowej generacji dla Xfce
 Name:		xfce4-panel
-Version:	4.2.1.1
-Release:	2
+Version:	4.2.3
+Release:	1
 License:	GPL v2
 Group:		X11/Applications
 Source0:	http://www.us.xfce.org/archive/xfce-%{version}/src/%{name}-%{version}.tar.gz
-# Source0-md5:	93986465cd92a9f32de60a44718a249e
+# Source0-md5:	3027c4601f208d290a988befed66a49f
 Patch0:		%{name}-locale-names.patch
+Patch1:		%{name}-handle-option.patch
 URL:		http://www.xfce.org/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
+BuildRequires:	docbook-dtd412-xml
+BuildRequires:	docbook-style-xsl
+BuildRequires:	gettext-devel
 BuildRequires:	intltool
 BuildRequires:	libtool
 BuildRequires:	libxfce4mcs-devel >= 4.2.1
@@ -23,11 +27,12 @@
 BuildRequires:	libxslt-progs
 BuildRequires:	pkgconfig >= 1:0.9.0
 BuildRequires:	xfce-mcs-manager-devel >= 4.2.1
+BuildRequires:	xfce4-dev-tools
 Requires:	hicolor-icon-theme
 Requires:	libxfce4mcs >= 4.2.1
 Requires:	libxfcegui4 >= 4.2.1
-Requires:	xfce4-icon-theme
 Requires:	xfce-mcs-manager >= 4.2.1
+Requires:	xfce4-icon-theme
 Obsoletes:	xfce4-themes
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -54,15 +59,16 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 mv -f po/{nb_NO,nb}.po
 mv -f po/{pt_PT,pt}.po
 
 %build
-glib-gettextize --copy --force
-intltoolize --copy --force
+%{__glib_gettextize}
+%{__intltoolize}
 %{__libtoolize}
-%{__aclocal} -I m4
+%{__aclocal} -I %{_datadir}/xfce4/dev-tools/m4macros
 %{__autoheader}
 %{__automake}
 %{__autoconf}
@@ -90,29 +96,32 @@
 %attr(755,root,root) %{_bindir}/*
 
 %dir %{_sysconfdir}/xdg/xfce4/panel
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/xdg/xfce4/panel/contents.xml
-%lang(ar) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/xdg/xfce4/panel/contents.xml.ar
-%lang(az) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/xdg/xfce4/panel/contents.xml.az
-%lang(ca) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/xdg/xfce4/panel/contents.xml.ca
-%lang(da) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/xdg/xfce4/panel/contents.xml.da
-%lang(eu) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/xdg/xfce4/panel/contents.xml.eu
-%lang(fi) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/xdg/xfce4/panel/contents.xml.fi
-%lang(fr) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/xdg/xfce4/panel/contents.xml.fr
-%lang(he) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/xdg/xfce4/panel/contents.xml.he
-%lang(hu) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/xdg/xfce4/panel/contents.xml.hu
-%lang(it) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/xdg/xfce4/panel/contents.xml.it
-%lang(ja) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/xdg/xfce4/panel/contents.xml.ja
-%lang(ko) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/xdg/xfce4/panel/contents.xml.ko
-%lang(lt) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/xdg/xfce4/panel/contents.xml.lt
-%lang(ms) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/xdg/xfce4/panel/contents.xml.ms
-%lang(nl) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/xdg/xfce4/panel/contents.xml.nl
-%lang(ro) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/xdg/xfce4/panel/contents.xml.ro
-%lang(ru) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/xdg/xfce4/panel/contents.xml.ru
-%lang(sk) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/xdg/xfce4/panel/contents.xml.sk
-%lang(tr) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/xdg/xfce4/panel/contents.xml.tr
-%lang(vi) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/xdg/xfce4/panel/contents.xml.vi
-%lang(zh_CN) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/xdg/xfce4/panel/contents.xml.zh_CN
-%lang(zh_TW) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/xdg/xfce4/panel/contents.xml.zh_TW
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/panel/contents.xml
+%lang(ar) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/panel/contents.xml.ar
+%lang(az) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/panel/contents.xml.az
+%lang(ca) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/panel/contents.xml.ca
+%lang(da) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/panel/contents.xml.da
+%lang(el) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/panel/contents.xml.el
+%lang(eu) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/panel/contents.xml.eu
+%lang(fi) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/panel/contents.xml.fi
+%lang(fr) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/panel/contents.xml.fr
+%lang(he) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/panel/contents.xml.he
+%lang(hu) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/panel/contents.xml.hu
+%lang(it) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/panel/contents.xml.it
+%lang(ja) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/panel/contents.xml.ja
+%lang(ko) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/panel/contents.xml.ko
+%lang(lt) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/panel/contents.xml.lt
+%lang(ms) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/panel/contents.xml.ms
+%lang(nl) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/panel/contents.xml.nl
+%lang(pl) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/panel/contents.xml.pl
+%lang(ro) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/panel/contents.xml.ro
+%lang(ru) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/panel/contents.xml.ru
+%lang(sk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/panel/contents.xml.sk
+%lang(sv) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/panel/contents.xml.sv
+%lang(tr) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/panel/contents.xml.tr
+%lang(vi) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/panel/contents.xml.vi
+%lang(zh_CN) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/panel/contents.xml.zh_CN
+%lang(zh_TW) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/panel/contents.xml.zh_TW
 
 %attr(755,root,root) %{_libdir}/xfce4/mcs-plugins/*.so
 %dir %{_libdir}/xfce4/panel-plugins
@@ -123,8 +132,9 @@
 %{_iconsdir}/hicolor/*/*/*
 
 %docdir %{_datadir}/xfce4/doc
-%{_datadir}/xfce4/doc/C/*.html
-%{_datadir}/xfce4/doc/C/images/*.png
+%{_datadir}/xfce4/doc/C/*
+%lang(fr) %{_datadir}/xfce4/doc/fr/*
+%lang(he) %{_datadir}/xfce4/doc/he/*
 
 %files devel
 %defattr(644,root,root,755)
@@ -137,6 +147,27 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.47.2.1  2006/07/05 09:18:59  havner
+- 4.2.3, HEAD merge
+
+Revision 1.52  2005/12/13 15:51:53  glen
+- adapterized (sorted %verify attrs)
+
+Revision 1.51  2005/11/10 05:38:05  charles
+- updated to 4.2.3
+- BR: docbook-dtd412-xml, docbook-style-xsl
+
+Revision 1.50  2005/05/19 00:17:56  troll
+- udpated to 4.2.2
+- BR: xfce4-dev-tools
+
+Revision 1.49  2005/05/11 19:40:30  charles
+- BR: gettext-devel
+
+Revision 1.48  2005/05/11 00:38:37  koorek
+- added patch that allow to remove handles
+- rel up
+
 Revision 1.47  2005/04/02 21:43:00  havner
 - R: hicolor-icon-theme (for /usr/share/icons/hicolor)
 - R: xfce4-icon-theme (for /usr/share/icons/Rodent)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/xfce4-panel.spec?r1=1.47&r2=1.47.2.1&f=u

More information about the pld-cvs-commit mailing list