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

megabajt megabajt at pld-linux.org
Wed Feb 16 19:43:08 CET 2011 

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

---- Files affected:
packages/xfce4-session:
   xfce4-session.spec (1.50 -> 1.51) 

---- Diffs:

================================================================
Index: packages/xfce4-session/xfce4-session.spec
diff -u packages/xfce4-session/xfce4-session.spec:1.50 packages/xfce4-session/xfce4-session.spec:1.51
--- packages/xfce4-session/xfce4-session.spec:1.50	Fri Feb  4 19:39:22 2011
+++ packages/xfce4-session/xfce4-session.spec	Wed Feb 16 19:43:03 2011
@@ -6,34 +6,38 @@
 Summary:	Xfce session manager
 Summary(pl.UTF-8):	Zarządca sesji Xfce
 Name:		xfce4-session
-Version:	4.6.2
-Release:	2
+Version:	4.8.0
+Release:	1
 License:	GPL v2
 Group:		X11/Applications
-Source0:	http://www.xfce.org/archive/xfce-%{version}/src/%{name}-%{version}.tar.bz2
-# Source0-md5:	9d9890130e45e0e9476591ed9ba2c9d5
+Source0:	http://archive.xfce.org/xfce/4.8/src/%{name}-%{version}.tar.bz2
+# Source0-md5:	7540bd6751242117208409ad8b736668
 Source1:	http://www.blues.gda.pl/SOURCES/%{name}-ubuntu_icons.tar.bz2
 # Source1-md5:	bf19add3364c0b0d804a7490c1a1fcbe
 Patch0:		%{name}-ubuntu_icons.patch
-URL:		http://www.xfce.org/projects/xfce4-session/
+URL:		http://www.xfce.org/projects/xfce4-session
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
 BuildRequires:	dbus-devel >= 1.0.0
 BuildRequires:	dbus-glib-devel >= 0.74
 BuildRequires:	gettext-devel
+BuildRequires:	gtk+2-devel >= 2:2.14.0
 BuildRequires:	intltool >= 0.35.0
-BuildRequires:	libglade2-devel
 BuildRequires:	libtool
-BuildRequires:	libwnck-devel >= 2.12.0
-BuildRequires:	libxfcegui4-devel >= %{version}
+BuildRequires:	libwnck-devel >= 2.22.0
+BuildRequires:	libxfce4ui-devel >= %{version}
+BuildRequires:	libxfce4util-devel >= %{version}
 BuildRequires:	pkgconfig
-BuildRequires:	rpmbuild(macros) >= 1.311
-BuildRequires:	xfce4-dev-tools >= 4.6.0
+BuildRequires:	rpmbuild(macros) >= 1.601
+BuildRequires:	upower-devel
+BuildRequires:	xfce4-dev-tools >= 4.8.0
+BuildRequires:	xfce4-panel-devel >= %{version}
 BuildRequires:	xfconf-devel >= %{version}
 BuildRequires:	xorg-lib-libSM-devel
-Requires(post,postun):	gtk-update-icon-cache
-Requires(post,postun):	hicolor-icon-theme
 Requires:	%{name}-libs = %{version}-%{release}
+Requires:	gtk-update-icon-cache
+Requires:	hicolor-icon-theme
+Requires:	upower
 Requires:	xfce4-dirs >= 4.6
 Requires:	xorg-app-iceauth
 Obsoletes:	xfce4-toys
@@ -61,7 +65,7 @@
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki zarządcy sesji dla środowiska Xfce
 Group:		X11/Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	libxfcegui4-devel >= %{version}
+Requires:	libxfce4ui-devel >= %{version}
 Requires:	xfconf-devel >= %{version}
 
 %description devel
@@ -94,8 +98,10 @@
 %{__automake}
 %{__autoconf}
 %configure \
+	--disable-hal \
 	--enable-session-screenshots \
 	%{!?with_static_libs:--disable-static} \
+	--disable-silent-rules \
 	ICEAUTH=/usr/bin/iceauth
 
 %{__make}
@@ -106,9 +112,11 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/splash/engines/*.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/xfce4/panel/plugins/*.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/xfce4/session/splash-engines/*.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
 
-rm -r $RPM_BUILD_ROOT%{_datadir}/locale/ur_PK
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/ur_PK
 
 %find_lang %{name}
 
@@ -126,30 +134,40 @@
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS COPYING ChangeLog ChangeLog.pre-xfce-devel NEWS README TODO
+%doc AUTHORS COPYING ChangeLog NEWS README TODO
 %attr(755,root,root) %{_bindir}/xfce4-session
 %attr(755,root,root) %{_bindir}/xfce4-session-logout
 %attr(755,root,root) %{_bindir}/xfce4-session-settings
 %attr(755,root,root) %{_bindir}/xfce4-tips
-%attr(755,root,root) %{_libdir}/balou-export-theme
-%attr(755,root,root) %{_libdir}/balou-install-theme
-%attr(755,root,root) %{_libdir}/xfsm-shutdown-helper
-%dir %{_libdir}/xfce4/splash
-%dir %{_libdir}/xfce4/splash/engines
-%attr(755,root,root) %{_libdir}/xfce4/splash/engines/*.so
+%dir %{_libdir}/xfce4/session
+%attr(755,root,root) %{_libdir}/xfce4/session/balou-export-theme
+%attr(755,root,root) %{_libdir}/xfce4/session/balou-install-theme
+%attr(755,root,root) %{_libdir}/xfce4/session/xfsm-shutdown-helper
+%dir %{_libdir}/xfce4/session/splash-engines
+%attr(755,root,root) %{_libdir}/xfce4/session/splash-engines/*.so
+%attr(755,root,root) %{_libdir}/xfce4/panel/plugins/*.so
 %{_sysconfdir}/xdg/autostart/*.desktop
 %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
 %{_datadir}/xfce4/tips
+%{_datadir}/xfce4/panel-plugins/xfsm-logout-plugin.desktop
 
 %{_datadir}/themes/Default/balou
 %{_desktopdir}/*.desktop
 %{_iconsdir}/hicolor/*/*/*
 %{_mandir}/man1/*.1*
 
-%{_datadir}/xfce4/doc/C/*.html
-%{_datadir}/xfce4/doc/C/images/*.png
-%lang(fr) %{_datadir}/xfce4/doc/fr/*.html
-%lang(fr) %{_datadir}/xfce4/doc/fr/images/*.png
+%dir %{_datadir}/doc/xfce4-session
+%dir %{_datadir}/doc/xfce4-session/html
+%{_datadir}/doc/xfce4-session/html/C
+%lang(da) %{_datadir}/doc/xfce4-session/html/da
+%lang(el) %{_datadir}/doc/xfce4-session/html/el
+%lang(gl) %{_datadir}/doc/xfce4-session/html/gl
+%lang(it) %{_datadir}/doc/xfce4-session/html/it
+%lang(ja) %{_datadir}/doc/xfce4-session/html/ja
+%lang(ru) %{_datadir}/doc/xfce4-session/html/ru
+%lang(sv) %{_datadir}/doc/xfce4-session/html/sv
+%lang(ug) %{_datadir}/doc/xfce4-session/html/ug
+%{_datadir}/doc/xfce4-session/html/xfce4-session.css
 
 %files libs
 %defattr(644,root,root,755)
@@ -159,7 +177,6 @@
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libxfsm-4.6.so
-%{_libdir}/libxfsm-4.6.la
 %{_includedir}/xfce4/xfce4-session-4.6
 %{_pkgconfigdir}/xfce4-session-2.0.pc
 
@@ -175,17 +192,43 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.51  2011/02/16 18:43:03  megabajt
+- merged from DEVEL
+
+Revision 1.46.2.7  2011/02/10 23:13:38  megabajt
+- drop libtool file
+- release 1
+
 Revision 1.50  2011/02/04 18:39:22  wiget
 - md5sum position fixed
 
 Revision 1.49  2011/02/04 18:24:10  wiget
 - Requires(post,postun): gtk-update-icon-cache
 
+Revision 1.46.2.6  2011/01/30 12:42:10  megabajt
+- updated to 4.8.0
+- removed obsolete -splash-path.patch
+
+Revision 1.46.2.5  2010/11/15 21:53:37  baggins
+- BR/R UPower(-devel)
+
+Revision 1.46.2.4  2010/11/15 13:25:24  baggins
+- fix splash engines path
+
+Revision 1.46.2.3  2010/11/14 23:55:30  baggins
+- fixed doc
+
+Revision 1.46.2.2  2010/11/14 23:47:32  baggins
+- hal is dead
+
 Revision 1.48  2010/11/14 16:22:03  baggins
 - no ur_PK locale
 
 Revision 1.47  2010/11/14 12:45:57  baggins
 - 4.6.2
+
+Revision 1.46.2.1  2010/11/14 12:24:02  baggins
+- 4.7.1, XFCE 4.8pre1
 
 Revision 1.46  2010/11/11 20:38:55  baggins
 - rel 3
================================================================

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

More information about the pld-cvs-commit mailing list