packages: xfce4-panel/xfce4-panel.spec - merged from DEVEL

megabajt megabajt at pld-linux.org
Wed Feb 16 19:15:47 CET 2011 

Author: megabajt                     Date: Wed Feb 16 18:15:47 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
packages/xfce4-panel:
   xfce4-panel.spec (1.83 -> 1.84) 

---- Diffs:

================================================================
Index: packages/xfce4-panel/xfce4-panel.spec
diff -u packages/xfce4-panel/xfce4-panel.spec:1.83 packages/xfce4-panel/xfce4-panel.spec:1.84
--- packages/xfce4-panel/xfce4-panel.spec:1.83	Fri Feb  4 19:24:09 2011
+++ packages/xfce4-panel/xfce4-panel.spec	Wed Feb 16 19:15:41 2011
@@ -1,42 +1,42 @@
 # $Revision$, $Date$
-%define		xfce_version	4.6.2
+%define		xfce_version	4.8.0
 Summary:	Next generation panel for Xfce
 Summary(pl.UTF-8):	Panel nowej generacji dla Xfce
 Name:		xfce4-panel
-Version:	4.6.4
-Release:	2
+Version:	4.8.1
+Release:	1
 License:	GPL v2, LGPL v2
 Group:		X11/Applications
-Source0:	http://archive.xfce.org/xfce/%{xfce_version}/src/%{name}-%{version}.tar.bz2
-# Source0-md5:	82f10a42aefca4cc26a6633e7478cc65
-URL:		http://www.xfce.org/projects/xfce4-panel/
-BuildRequires:	autoconf >= 2.50
-BuildRequires:	automake >= 1:1.8
+Source0:	http://archive.xfce.org/src/xfce/xfce4-panel/4.8/%{name}-%{version}.tar.bz2
+# Source0-md5:	449e37624da9b1f4d980a11d2073e6cc
+URL:		http://www.xfce.org/projects/xfce4-panel
+BuildRequires:	dbus-glib-devel >= 0.73
 BuildRequires:	docbook-dtd412-xml
 BuildRequires:	docbook-style-xsl
-BuildRequires:	exo-devel >= 0.3.101
+BuildRequires:	exo-devel >= 0.6.0
+BuildRequires:	garcon-devel >= 0.1.5
 BuildRequires:	gettext-devel
-BuildRequires:	gtk+2-devel >= 2:2.10.6
-BuildRequires:	gtk-doc
+BuildRequires:	glib2-devel >= 1:2.18.0
+BuildRequires:	gtk+2-devel >= 2:2.14.0
+BuildRequires:	gtk-doc >= 1.9
 BuildRequires:	gtk-doc-automake
 BuildRequires:	intltool >= 0.35.0
-BuildRequires:	libtool
-BuildRequires:	libwnck-devel
+BuildRequires:	libwnck-devel >= 2.22.0
+BuildRequires:	libxfce4ui-devel >= %{xfce_version}
 BuildRequires:	libxfce4util-devel >= %{xfce_version}
-BuildRequires:	libxfcegui4-devel >= %{xfce_version}
 BuildRequires:	libxslt-progs
 BuildRequires:	pkgconfig >= 1:0.9.0
-BuildRequires:	rpmbuild(macros) >= 1.311
-BuildRequires:	startup-notification-devel >= 0.8
-BuildRequires:	xfce4-dev-tools >= 4.6.0
-Requires(post,postun):	gtk-update-icon-cache
-Requires(post,postun):	hicolor-icon-theme
+BuildRequires:	rpmbuild(macros) >= 1.601
+BuildRequires:	xfce4-dev-tools >= %{xfce_version}
+BuildRequires:	xfconf-devel >= %{xfce_version}
 Requires:	%{name}-libs = %{version}-%{release}
-# NOTE: it's temporary. xfce4-icon-theme has to match XDG specification.
-#       Currently Tango is used as a default icon theme.
+Requires:	gtk-update-icon-cache
+Requires:	hicolor-icon-theme
+# NOTE: xfce4-icon-theme doesn't match XDG specification.
+#       Use Tango as a default icon theme.
 Requires:	tango-icon-theme
 Requires:	xfce4-dirs >= 4.6
-#Requires:	xfce4-icon-theme
+Suggests:	xfce-preferred-applications
 Obsoletes:	xfce4-iconbox
 Obsoletes:	xfce4-showdesktop-plugin
 Obsoletes:	xfce4-systray
@@ -79,8 +79,10 @@
 Summary(pl.UTF-8):	Pliki nagłówkowe do budowania wtyczek panelu Xfce
 Group:		X11/Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
+Requires:	glib2-devel >= 1:2.18.0
+Requires:	gtk+2-devel >= 2:2.14.0
+Requires:	libxfce4ui-devel >= %{xfce_version}
 Requires:	libxfce4util-devel >= %{xfce_version}
-Requires:	libxfcegui4-devel >= %{xfce_version}
 
 %description devel
 Header files for building Xfce panel plugins.
@@ -92,29 +94,23 @@
 %setup -q
 
 %build
-%{__gtkdocize}
-%{__glib_gettextize}
-%{__intltoolize}
-%{__libtoolize}
-%{__aclocal}
-%{__autoheader}
-%{__automake}
-%{__autoconf}
 %configure \
+	--disable-static \
 	--enable-gtk-doc \
-	--enable-startup-notification \
-	--with-html-dir=%{_gtkdocdir}
+	--with-html-dir=%{_gtkdocdir} \
+	--disable-silent-rules
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{%{_libdir},%{_datadir}}/xfce4/panel-plugins
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/xfce4/panel-plugins/*.la
-
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/xfce4/panel/plugins/*.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
 %{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/ur_PK
 
 %find_lang %{name}
@@ -133,52 +129,54 @@
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog HACKING NEWS README
+%doc AUTHORS ChangeLog NEWS README
 %attr(755,root,root) %{_bindir}/xfce4-panel
-%attr(755,root,root) %{_bindir}/xfce4-popup-windowlist
+%attr(755,root,root) %{_bindir}/xfce4-popup-applicationsmenu
+%attr(755,root,root) %{_bindir}/xfce4-popup-directorymenu
+%attr(755,root,root) %{_bindir}/xfce4-popup-windowmenu
 
 %dir %{_sysconfdir}/xdg/xfce4/panel
-%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
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/panel/default.xml
 %dir %{_libdir}/xfce4
+%dir %{_libdir}/xfce4/panel
+%attr(755,root,root) %{_libdir}/xfce4/panel/migrate
+%attr(755,root,root) %{_libdir}/xfce4/panel/wrapper
 %dir %{_libdir}/xfce4/panel-plugins
-%attr(755,root,root) %{_libdir}/xfce4/panel-plugins/libactions.so
-%attr(755,root,root) %{_libdir}/xfce4/panel-plugins/libclock.so
-%attr(755,root,root) %{_libdir}/xfce4/panel-plugins/libiconbox.so
-%attr(755,root,root) %{_libdir}/xfce4/panel-plugins/liblauncher.so
-%attr(755,root,root) %{_libdir}/xfce4/panel-plugins/libpager.so
-%attr(755,root,root) %{_libdir}/xfce4/panel-plugins/libseparator.so
-%attr(755,root,root) %{_libdir}/xfce4/panel-plugins/libshowdesktop.so
-%attr(755,root,root) %{_libdir}/xfce4/panel-plugins/libsystray.so
-%attr(755,root,root) %{_libdir}/xfce4/panel-plugins/libtasklist.so
-%attr(755,root,root) %{_libdir}/xfce4/panel-plugins/libwindowlist.so
-%{_datadir}/xfce4/panel-plugins
+%dir %{_libdir}/xfce4/panel/plugins
+%attr(755,root,root) %{_libdir}/xfce4/panel/plugins/libactions.so
+%attr(755,root,root) %{_libdir}/xfce4/panel/plugins/libapplicationsmenu.so
+%attr(755,root,root) %{_libdir}/xfce4/panel/plugins/libclock.so
+%attr(755,root,root) %{_libdir}/xfce4/panel/plugins/libdirectorymenu.so
+%attr(755,root,root) %{_libdir}/xfce4/panel/plugins/liblauncher.so
+%attr(755,root,root) %{_libdir}/xfce4/panel/plugins/libpager.so
+%attr(755,root,root) %{_libdir}/xfce4/panel/plugins/libseparator.so
+%attr(755,root,root) %{_libdir}/xfce4/panel/plugins/libshowdesktop.so
+%attr(755,root,root) %{_libdir}/xfce4/panel/plugins/libsystray.so
+%attr(755,root,root) %{_libdir}/xfce4/panel/plugins/libtasklist.so
+%attr(755,root,root) %{_libdir}/xfce4/panel/plugins/libwindowmenu.so
+%{_datadir}/xfce4/panel
+%dir %{_datadir}/xfce4/panel-plugins
+%dir %{_datadir}/doc/xfce4-panel
+%{_datadir}/doc/xfce4-panel/README.gtkrc-2.0
+%dir %{_datadir}/doc/xfce4-panel/html
+%{_datadir}/doc/xfce4-panel/html/*.css
+%{_datadir}/doc/xfce4-panel/html/C
 %{_iconsdir}/hicolor/*/*/*
 %{_desktopdir}/*.desktop
 
-%{_datadir}/xfce4/doc/C/*.html
-%{_datadir}/xfce4/doc/C/images/*.png
-
 %files apidocs
 %defattr(644,root,root,755)
-%{_gtkdocdir}/libxfce4panel
+%{_gtkdocdir}/libxfce4panel-1.0
 
 %files libs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libxfce4panel.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libxfce4panel.so.1
+%attr(755,root,root) %{_libdir}/libxfce4panel-1.0.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libxfce4panel-1.0.so.3
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libxfce4panel.so
-%{_libdir}/libxfce4panel.la
-%{_includedir}/xfce4/libxfce4panel
+%attr(755,root,root) %{_libdir}/libxfce4panel-1.0.so
+%{_includedir}/xfce4/libxfce4panel-1.0
 %{_pkgconfigdir}/libxfce4panel-1.0.pc
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -187,9 +185,33 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.84  2011/02/16 18:15:41  megabajt
+- merged from DEVEL
+
+Revision 1.79.2.6  2011/02/14 18:01:24  megabajt
+- provide %{_libdir}/xfce4/panel-plugins
+
+Revision 1.79.2.5  2011/02/07 22:34:52  megabajt
+- updated to 4.8.1
+- removed -generic-menu.patch (now XDG_MENU_PREFIX is used to determine
+  which menu should be used)
+- drop libtool file
+
 Revision 1.83  2011/02/04 18:24:09  wiget
 - Requires(post,postun): gtk-update-icon-cache
 
+Revision 1.79.2.4  2011/01/30 11:41:00  megabajt
+- provide old directory for panel plugin files (still supported according to changelog)
+
+Revision 1.79.2.3  2011/01/28 22:47:44  megabajt
+- updated to 4.8.0
+- -generic-menu.patch seems to be not needed
+- release 0.9
+
+Revision 1.79.2.2  2010/11/15 12:52:40  baggins
+- prefer generic applications menu
+- build cleanup
+
 Revision 1.82  2010/11/14 16:11:14  baggins
 - no ur_PK locale
 
@@ -198,6 +220,9 @@
 
 Revision 1.80  2010/11/14 12:43:58  baggins
 - 4.6.4, XFCE 4.6.2
+
+Revision 1.79.2.1  2010/11/14 12:21:01  baggins
+- 4.7.4, XFCE 4.8pre1
 
 Revision 1.79  2010/11/11 21:02:05  baggins
 - rel 5
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xfce4-panel/xfce4-panel.spec?r1=1.83&r2=1.84&f=u

More information about the pld-cvs-commit mailing list