SPECS: xfce-mcs-manager.spec, xfce-mcs-plugins.spec - merged from ...

freetz freetz at pld-linux.org
Sun Jul 16 17:38:39 CEST 2006 

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

---- Files affected:
SPECS:
   xfce-mcs-manager.spec (1.46 -> 1.47) , xfce-mcs-plugins.spec (1.40 -> 1.41) 

---- Diffs:

================================================================
Index: SPECS/xfce-mcs-manager.spec
diff -u SPECS/xfce-mcs-manager.spec:1.46 SPECS/xfce-mcs-manager.spec:1.47
--- SPECS/xfce-mcs-manager.spec:1.46	Tue Jul  4 22:00:28 2006
+++ SPECS/xfce-mcs-manager.spec	Sun Jul 16 17:38:34 2006
@@ -2,16 +2,16 @@
 #
 # TODO:
 # - check the icon & the desktop file
-
+#
 Summary:	Multi channel settings manager
 Summary(pl):	Zarządca ustawień wielokanałowych
 Name:		xfce-mcs-manager
-Version:	4.2.3
+Version:	4.3.90.2
 Release:	1
 License:	LGPL v2
 Group:		X11/Applications
-Source0:	http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-%{version}/src/%{name}-%{version}.tar.gz
-# Source0-md5:	029e7cc2b20a3de5f908483b4253f492
+Source0:        http://www.xfce.org/archive/xfce-%{version}/src/%{name}-%{version}.tar.bz2
+# Source0-md5:	32d6107a45dbcfc3b41a10404d9caa77
 Patch0:		%{name}-locale-names.patch
 URL:		http://www.xfce.org/
 BuildRequires:	autoconf >= 2.50
@@ -22,7 +22,8 @@
 BuildRequires:	libxfce4mcs-devel >= %{version}
 BuildRequires:	libxfcegui4-devel >= %{version}
 BuildRequires:	pkgconfig >= 1:0.9.0
-BuildRequires:	xfce4-dev-tools
+BuildRequires:	xfce4-dev-tools >= 4.3.90.2
+Requires(post,postun):	gtk+2 >= 2:2.10.0
 Requires:	libxfce4mcs >= %{version}
 Requires:	libxfcegui4 >= %{version}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -55,20 +56,21 @@
 mv -f po/{nb_NO,nb}.po
 
 %build
-intltoolize --copy --force
-glib-gettextize --copy --force
+%{__intltoolize}
+%{__glib_gettextize}
 %{__libtoolize}
-%{__aclocal} -I %{_datadir}/xfce4/dev-tools/m4macros
+%{__aclocal}
 %{__autoheader}
 %{__automake}
 %{__autoconf}
+LDFLAGS="%{rpmldflags} -Wl,--as-needed"
 %configure
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_libdir}/xfce4/mcs-plugins,%{_sysconfdir}/xdg/xfce4}
+install -d $RPM_BUILD_ROOT{%{_libdir}/xfce4/{mcs-plugins,modules},%{_sysconfdir}/xdg/xfce4}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -78,6 +80,12 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor
+
+%postun
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog
@@ -87,12 +95,13 @@
 
 %dir %{_libdir}/xfce4
 %dir %{_libdir}/xfce4/mcs-plugins
+%dir %{_libdir}/xfce4/modules
 
 %docdir %{_datadir}/xfce4/doc
 %dir %{_datadir}/xfce4/doc
 %{_datadir}/xfce4/doc/C
 %lang(fr) %{_datadir}/xfce4/doc/fr
-%lang(he) %{_datadir}/xfce4/doc/he
+%lang(it) %{_datadir}/xfce4/doc/it
 
 # common for some other xfce* packages
 %dir %{_sysconfdir}/xdg/xfce4
@@ -108,6 +117,24 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.47  2006/07/16 15:38:34  freetz
+- merged from DEVEL
+
+Revision 1.44.2.5  2006/07/16 15:33:14  freetz
+- 4.3.90.2, updated deps, update icon cache, --as-needed support
+
+Revision 1.44.2.4  2006/07/01 00:06:20  charles
+- added shared dir for modules
+
+Revision 1.44.2.3  2006/04/18 21:46:07  freetz
+- use macros
+
+Revision 1.44.2.2  2006/04/18 20:27:43  troll
+- intltoolize was removed by mistake
+
+Revision 1.44.2.1  2006/04/18 19:53:09  troll
+- updated to 4.3.90.1 (4.4 beta 1)
+
 Revision 1.46  2006/07/04 20:00:28  qboosh
 - intltoolize before glib-gettextize, builds now
 

================================================================
Index: SPECS/xfce-mcs-plugins.spec
diff -u SPECS/xfce-mcs-plugins.spec:1.40 SPECS/xfce-mcs-plugins.spec:1.41
--- SPECS/xfce-mcs-plugins.spec:1.40	Thu Apr 20 11:26:20 2006
+++ SPECS/xfce-mcs-plugins.spec	Sun Jul 16 17:38:34 2006
@@ -2,27 +2,26 @@
 Summary:	Plugins for multi channel settings manager
 Summary(pl):	Wtyczki dla zarządcy ustawień wielokanałowych
 Name:		xfce-mcs-plugins
-Version:	4.2.3
+Version:	4.3.90.2
 Release:	1
 License:	GPL
 Group:		X11/Applications
-Source0:	http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-%{version}/src/%{name}-%{version}.tar.gz
-# Source0-md5:	cdd1ca3ff7610a45658aa801b91da8dc
+Source0:	http://www.xfce.org/archive//xfce-%{version}/src/%{name}-%{version}.tar.bz2
+# Source0-md5:	4fd5b8f1f531bcc66f6aeaff76998f0c
 Patch0:		%{name}-locale-names.patch
 URL:		http://www.xfce.org/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
 BuildRequires:	gettext-devel
-BuildRequires:	gtk+2-devel >= 1:2.2.0
+BuildRequires:	gtk+2-devel >= 1:2.10.0
 BuildRequires:	intltool
 BuildRequires:	libtool
 BuildRequires:	pkgconfig >= 1:0.9.0
-BuildRequires:	xfce-mcs-manager-devel >= 4.1.2
-BuildRequires:	xfce4-dev-tools
-BuildRequires:	xfce4-panel-devel >= %{version}
-Requires:	gtk+2 >= 1:2.2.0
-Requires:	xfce-mcs-manager >= 4.1.2
-Requires:	xfce4-panel >= %{version}
+BuildRequires:	xfce-mcs-manager-devel >= %{version}
+BuildRequires:	xfce4-dev-tools >= %{version}
+Requires(post,postun):	gtk+2 >= 2:2.10.0
+Requires:	gtk+2 >= 1:2.10.0
+Requires:	xfce-mcs-manager >= %{version}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -40,13 +39,14 @@
 mv -f po/{pt_PT,pt}.po
 
 %build
-glib-gettextize --copy --force
-intltoolize --copy --force
+%{__glib_gettextize}
+%{__intltoolize}
 %{__libtoolize}
-%{__aclocal} -I %{_datadir}/xfce4/dev-tools/m4macros
+%{__aclocal}
 %{__autoheader}
 %{__automake}
 %{__autoconf}
+LDFLAGS="%{rpmldflags} -Wl,--as-needed"
 %configure
 %{__make}
 
@@ -63,13 +63,20 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor
+
+%postun
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog
 %docdir %{_datadir}/xfce4/doc
 %{_datadir}/xfce4/doc/C/*
 %lang(fr) %{_datadir}/xfce4/doc/fr/*
-%lang(he) %{_datadir}/xfce4/doc/he/*
+%lang(it) %{_datadir}/xfce4/doc/it/*
+%{_datadir}/%{name}
 %{_iconsdir}/hicolor/*/*/*
 
 %attr(755,root,root) %{_libdir}/xfce4/mcs-plugins/*.so
@@ -82,6 +89,15 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.41  2006/07/16 15:38:34  freetz
+- merged from DEVEL
+
+Revision 1.40.2.2  2006/07/16 15:33:14  freetz
+- 4.3.90.2, updated deps, update icon cache, --as-needed support
+
+Revision 1.40.2.1  2006/04/26 18:32:18  troll
+- updated to 4.3.90.1
+
 Revision 1.40  2006/04/20 09:26:20  ankry
 - tab
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/xfce-mcs-manager.spec?r1=1.46&r2=1.47&f=u
    http://cvs.pld-linux.org/SPECS/xfce-mcs-plugins.spec?r1=1.40&r2=1.41&f=u

More information about the pld-cvs-commit mailing list