Author: megabajt Date: Sun Jan 28 22:44:19 2007 GMT Module: SPECS Tag: AC-branch ---- Log message: - updated to 4.4.0, merged from HEAD
---- Files affected: SPECS: xfce4-panel.spec (1.47.2.2 -> 1.47.2.3) ---- Diffs: ================================================================ Index: SPECS/xfce4-panel.spec diff -u SPECS/xfce4-panel.spec:1.47.2.2 SPECS/xfce4-panel.spec:1.47.2.3 --- SPECS/xfce4-panel.spec:1.47.2.2 Wed Jul 5 11:30:40 2006 +++ SPECS/xfce4-panel.spec Sun Jan 28 23:44:14 2007 @@ -1,39 +1,42 @@ # $Revision$, $Date$ -# -# TODO: -# - check the icon & the desktop file Summary: Next generation panel for Xfce Summary(pl): Panel nowej generacji dla Xfce Name: xfce4-panel -Version: 4.2.3 +Version: 4.4.0 Release: 1 -License: GPL v2 +License: GPL v2, LGPL v2 Group: X11/Applications -Source0: http://www.us.xfce.org/archive/xfce-%{version}/src/%{name}-%{version}.tar.gz -# Source0-md5: 3027c4601f208d290a988befed66a49f +Source0: http://www.xfce.org/archive/xfce-%{version}/src/%{name}-%{version}.tar.bz2 +# Source0-md5: c46925d2df393dba8f16979ba87d4776 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: gtk-doc-automake +BuildRequires: intltool >= 0.35.0 BuildRequires: libtool -BuildRequires: libxfce4mcs-devel >= 4.2.1 -BuildRequires: libxfcegui4-devel >= 4.2.1 -BuildRequires: libxml2-devel >= 2.4.0 +BuildRequires: libxfce4mcs-devel >= %{version} +BuildRequires: libxfcegui4-devel >= %{version} +BuildRequires: libxml2-devel >= 1:2.6.26 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: xfce-mcs-manager >= 4.2.1 +BuildRequires: rpmbuild(macros) >= 1.311 +BuildRequires: xfce-mcs-manager-devel >= %{version} +BuildRequires: xfce4-dev-tools >= %{version} +Requires(post,postun): gtk+2 +Requires(post,postun): hicolor-icon-theme +Requires: %{name}-libs = %{version}-%{release} +Requires: xfce-mcs-manager >= %{version} Requires: xfce4-icon-theme +Obsoletes: xfce4-iconbox +Obsoletes: xfce4-showdesktop-plugin +Obsoletes: xfce4-systray +Obsoletes: xfce4-taskbar-plugin Obsoletes: xfce4-themes +Obsoletes: xfce4-windowlist-plugin BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -42,13 +45,36 @@ %description -l pl xfce4-panel to panel dla środowiska Xfce. +%package apidocs +Summary: Xfce panel API documentation +Summary(pl): Dokumentacja API panelu Xfce +Group: Documentation +Requires: gtk-doc-common + +%description apidocs +Xfce panel API documentation. + +%description apidocs -l pl +Dokumentacja API panelu Xfce. + +%package libs +Summary: xfce4panel library +Summary(pl): Biblioteka xfce4panel +Group: Development/Libraries + +%description libs +This package contains xfce4panel library. + +%description libs -l pl +Pakiet ten zawiera bibliotekę xfce4panel. + %package devel Summary: Header files for building Xfce panel plugins Summary(pl): Pliki nagłówkowe do budowania wtyczek panelu Xfce Group: Development/Libraries -Requires: libxfcegui4-devel >= 4.2.1 -Requires: libxml2-devel >= 2.4.0 -# doesn't require base +Requires: %{name}-libs = %{version}-%{release} +Requires: libxfcegui4-devel >= %{version} +Requires: libxml2-devel >= 1:2.6.26 %description devel Header files for building Xfce panel plugins. @@ -59,23 +85,24 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 mv -f po/{nb_NO,nb}.po mv -f po/{pt_PT,pt}.po %build -%{__intltoolize} %{__glib_gettextize} +%{__intltoolize} %{__libtoolize} -%{__aclocal} -I %{_datadir}/xfce4/dev-tools/m4macros +%{__aclocal} %{__autoheader} %{__automake} %{__autoconf} -%configure +%configure \ + --enable-gtk-doc \ + --enable-startup-notification \ + --with-html-dir=%{_gtkdocdir} %{__make} -%{__make} html %install rm -rf $RPM_BUILD_ROOT @@ -83,62 +110,58 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/{mcs-plugins,panel-plugins}/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/{,xfce4/{mcs-plugins,panel-plugins}}/*.la %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT +%post +%update_icon_cache hicolor + +%postun +%update_icon_cache hicolor + +%post libs -p /sbin/ldconfig +%postun libs -p /sbin/ldconfig + %files -f %{name}.lang %defattr(644,root,root,755) -%doc AUTHORS ChangeLog README TODO +%doc AUTHORS ChangeLog HACKING NEWS README README.Kiosk README.Plugins %attr(755,root,root) %{_bindir}/* %dir %{_sysconfdir}/xdg/xfce4/panel -%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 +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/panel/clock-14.rc +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/panel/launcher-7.rc +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/panel/launcher-8.rc +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/panel/launcher-9.rc +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/panel/launcher-10.rc +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/panel/panels.xml +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/panel/systray-4.rc +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/panel/xfce4-menu-5.rc %dir %{_libdir}/xfce4/panel-plugins +%attr(755,root,root) %{_libdir}/xfce4/mcs-plugins/*.so %attr(755,root,root) %{_libdir}/xfce4/panel-plugins/*.so - -%{_iconsdir}/hicolor/48x48/apps/xfce-mail.png -%{_desktopdir}/*.desktop +%{_datadir}/xfce4/panel-plugins %{_iconsdir}/hicolor/*/*/* +%{_desktopdir}/*.desktop -%docdir %{_datadir}/xfce4/doc %{_datadir}/xfce4/doc/C/* -%lang(fr) %{_datadir}/xfce4/doc/fr/* -%lang(he) %{_datadir}/xfce4/doc/he/* +%docdir %{_datadir}/xfce4/doc + +%files apidocs +%defattr(644,root,root,755) +%{_gtkdocdir}/libxfce4panel + +%files libs +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/libxfce4panel.so.*.* %files devel %defattr(644,root,root,755) -%{_includedir}/xfce4/panel +%attr(755,root,root) %{_libdir}/libxfce4panel.so +%{_includedir}/xfce4/libxfce4panel %{_pkgconfigdir}/*.pc %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -147,6 +170,75 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.47.2.3 2007/01/28 22:44:14 megabajt +- updated to 4.4.0, merged from HEAD + +Revision 1.64 2007/01/28 14:04:51 megabajt +- added O: xfce4-windowlist-plugin, xfce4-taskbar-plugin, xfce4-showdesktop-plugin, xfce4-iconbox + +Revision 1.63 2007/01/22 15:29:31 megabajt +- updated to 4.4.0 +- added apidocs subpackage + +Revision 1.62 2006/11/06 14:56:03 megabajt +- updated to 4.3.99.2 (Xfce 4.4RC2) + +Revision 1.61 2006/09/11 14:36:14 megabajt +- fixed gtk-doc/html location (thx adgor) +- rel. 2 + +Revision 1.60 2006/09/04 19:35:32 megabajt +- up to 4.3.99.1 +- use rpm macros +- rm filterout_ld definition (now it builds with --as-needed) + +Revision 1.59 2006/08/20 16:04:52 qboosh +- filterout needs rpm.macros >= 1.315 + +Revision 1.58 2006/08/12 18:23:30 ankry +- formatting + +Revision 1.57 2006/08/05 21:07:11 sparky +- convert no_build_with_as_needed 1 to filterout_ld -Wl,--as-needed + +Revision 1.56 2006/07/24 18:23:46 freetz +- rel.2, disabled --as-needed + +Revision 1.55 2006/07/16 15:56:26 freetz +- missing dir + +Revision 1.54 2006/07/16 15:50:39 freetz +- clean up + +Revision 1.53 2006/07/16 15:44:48 freetz +- merged from DEVEL + +Revision 1.52.2.7 2006/07/16 15:42:54 freetz +- 4.3.90.2, updated deps, libs subpackage (builder friendly), updated + file list, update icon cache, dropped outdated handle-option patch and + removed obsolete configure_ac patch + +Revision 1.52.2.6 2006/07/01 14:44:16 lmasko +- added patch xfce4-panel-configure_ac.patch to correct configure.ac syntax + +Revision 1.52.2.5 2006/05/20 08:07:05 charles +- -devel now req. base + +Revision 1.52.2.4 2006/05/20 07:50:34 charles +- fixed %files, cleanups + +Revision 1.52.2.3 2006/05/17 03:59:24 charles +- BR: gtk-doc-automake + +Revision 1.52.2.2 2006/04/27 20:51:03 troll +- Obsoletes: xfce4-systray + +Revision 1.52.2.1 2006/04/20 16:29:44 troll +- updated to 4.3.90.1 +- parts are licensed under LGPL v2 +- disabled handle-options (probably not needed anymore) +- added --enable-gtk-doc to %%configure + Revision 1.47.2.2 2006/07/05 09:30:40 havner - intltoolize before glib-gettextize @@ -161,7 +253,7 @@ - BR: docbook-dtd412-xml, docbook-style-xsl Revision 1.50 2005/05/19 00:17:56 troll -- udpated to 4.2.2 +- updated to 4.2.2 - BR: xfce4-dev-tools Revision 1.49 2005/05/11 19:40:30 charles ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xfce4-panel.spec?r1=1.47.2.2&r2=1.47.2.3&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
