SPECS: xfce4-panel.spec - merged from DEVEL

freetz freetz at pld-linux.org
Sun Jul 16 17:44:53 CEST 2006


Author: freetz                       Date: Sun Jul 16 15:44:53 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
SPECS:
   xfce4-panel.spec (1.52 -> 1.53) 

---- Diffs:

================================================================
Index: SPECS/xfce4-panel.spec
diff -u SPECS/xfce4-panel.spec:1.52 SPECS/xfce4-panel.spec:1.53
--- SPECS/xfce4-panel.spec:1.52	Tue Dec 13 16:51:53 2005
+++ SPECS/xfce4-panel.spec	Sun Jul 16 17:44:48 2006
@@ -2,37 +2,39 @@
 #
 # 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.3.90.2
 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:	e13f4a8ef25a09525d95e56a54673318
 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:	gtk-doc-automake
 BuildRequires:	intltool
 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
+BuildRequires:	xfce-mcs-manager-devel >= %{version}
+BuildRequires:	xfce4-dev-tools >= %{version}
+Requires:	%{name}-libs = %{version}-%{release}
+Requires(post,postun):	gtk+2 >= 2:2.10.0
 Requires:	hicolor-icon-theme
-Requires:	libxfce4mcs >= 4.2.1
-Requires:	libxfcegui4 >= 4.2.1
-Requires:	xfce-mcs-manager >= 4.2.1
+Requires:	xfce-mcs-manager >= %{version}
 Requires:	xfce4-icon-theme
+Obsoletes:	xfce4-systray
 Obsoletes:	xfce4-themes
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -42,13 +44,26 @@
 %description -l pl
 xfce4-panel to panel dla środowiska Xfce.
 
+%package libs                                                                                                                               
+Summary:	xfce4panel library
+Summary(pl):	Biblioteka xfce4panel
+Group:		Development/Libraries
+Requires:	libxfce4mcs >= %{version}
+Requires:	libxfcegui4 >= %{version}
+                                                                                                                                            
+%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,7 +74,6 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 mv -f po/{nb_NO,nb}.po
 mv -f po/{pt_PT,pt}.po
@@ -68,14 +82,17 @@
 %{__glib_gettextize}
 %{__intltoolize}
 %{__libtoolize}
-%{__aclocal} -I %{_datadir}/xfce4/dev-tools/m4macros
+%{__aclocal}
 %{__autoheader}
 %{__automake}
 %{__autoconf}
-%configure
+# breaks build
+#LDFLAGS="%{rpmldflags} -Wl,--as-needed"
+%configure \
+	--enable-gtk-doc
 
 %{__make}
-%{__make} html
+#%{__make} html
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -83,62 +100,54 @@
 %{__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
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor
+
+%postun
+gtk-update-icon-cache -qf %{_datadir}/icons/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
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/panel/panels.xml
+%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
 
-%attr(755,root,root) %{_libdir}/xfce4/mcs-plugins/*.so
 %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
+%docdir %{_datadir}/gtk-doc/html/libxfce4panel
+%{_datadir}/gtk-doc/html/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 +156,35 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+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.52  2005/12/13 15:51:53  glen
 - adapterized (sorted %verify attrs)
 
@@ -155,7 +193,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.52&r2=1.53&f=u



More information about the pld-cvs-commit mailing list