[xfce4-session] - Update to 4.7.3

Christoph Wickert cwickert at fedoraproject.org
Sat Jan 8 22:12:47 UTC 2011 

commit 4205b8b32439c69573340f5112624fe279db1ccd
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Sat Jan 8 23:12:34 2011 +0100

    - Update to 4.7.3

 .gitignore                           |    1 +
 sources                              |    2 +-
 xfce4-session-4.5.92-hide-tips.patch |    9 --
 xfce4-session-4.7.2-hide-tips.patch  |    8 ++
 xfce4-session-gnome-keyring.patch    |   81 -----------------
 xfce4-session.spec                   |  166 +++++++++++++++++++++-------------
 6 files changed, 112 insertions(+), 155 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8403467..51be8c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 xfce4-session-4.6.2.tar.bz2
+/xfce4-session-4.7.3.tar.bz2
diff --git a/sources b/sources
index ac684e3..eaad40d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9d9890130e45e0e9476591ed9ba2c9d5  xfce4-session-4.6.2.tar.bz2
+ae6c98b4419cc4b651a7e68c4afdf432  xfce4-session-4.7.3.tar.bz2
diff --git a/xfce4-session-4.7.2-hide-tips.patch b/xfce4-session-4.7.2-hide-tips.patch
new file mode 100644
index 0000000..529c27f
--- /dev/null
+++ b/xfce4-session-4.7.2-hide-tips.patch
@@ -0,0 +1,8 @@
+--- xfce4-session-4.7.2.orig/xfce4-tips/xfce4-tips-autostart.desktop.in	2010-12-03 21:05:54.000000000 +0100
++++ xfce4-session-4.7.2/xfce4-tips/xfce4-tips-autostart.desktop.in	2010-12-05 02:16:24.995433232 +0100
+@@ -6,4 +6,4 @@
+ Terminal=false
+ Type=Application
+ OnlyShowIn=XFCE;
+-Hidden=false
++Hidden=true
diff --git a/xfce4-session.spec b/xfce4-session.spec
index 778ad3a..cb9eaa8 100644
--- a/xfce4-session.spec
+++ b/xfce4-session.spec
@@ -1,77 +1,105 @@
-Summary: Xfce session manager
-Name: xfce4-session
-Version: 4.6.2
-Release: 2%{?dist}
-License: GPLv2+
-URL: http://www.xfce.org/
-Source0: http://archive.xfce.org/src/xfce/xfce4-session/4.6/xfce4-session-%{version}.tar.bz2
-Patch0: xfce4-session-4.5.92-hide-tips.patch
+%global xfceversion 4.7
+
+Name:           xfce4-session
+Version:        4.7.3
+Release:        1%{?dist}
+Summary:        Xfce session manager
+
+Group:          User Interface/Desktops
+License:        GPLv2+
+URL:            http://www.xfce.org/
+Source0:        http://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2
+Patch0:         xfce4-session-4.7.2-hide-tips.patch
 # http://patches.ubuntu.com/x/xfce4-session/extracted/01_correct_shadows.patch
-Patch1: xfce4-session-4.6.1-correct-shadows.patch
-# Already upstream in  http://bugzilla.xfce.org/show_bug.cgi?id=5912
-Patch2: xfce4-session-gnome-keyring.patch
-Group: User Interface/Desktops
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: libxfcegui4 >= %{version}
-Requires: xorg-x11-server-utils
-Requires: redhat-menus
-BuildRequires: libxfcegui4-devel >= %{version}
-BuildRequires: startup-notification-devel
-BuildRequires: gettext intltool
-BuildRequires: xorg-x11-server-utils
-BuildRequires: dbus-devel GConf2-devel
-BuildRequires: libwnck-devel
-BuildRequires: libglade2-devel
-BuildRequires: dbus-glib-devel
-BuildRequires: xfconf-devel
-BuildRequires: libSM-devel
-Requires: fortune-mod
+Patch1:         xfce4-session-4.6.1-correct-shadows.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+#BuildRequires:  dbus-devel 
+#BuildRequires:  dbus-glib-devel
+BuildRequires:  libglade2-devel
+BuildRequires:  libSM-devel
+BuildRequires:  libwnck-devel
+BuildRequires:  libxfce4ui-devel >= %{xfceversion}
+BuildRequires:  startup-notification-devel
+BuildRequires:  xfce4-panel-devel >= %{xfceversion}
+BuildRequires:  xorg-x11-server-utils
+BuildRequires:  xfconf-devel >= %{xfceversion}
+# GNOME compatibility
+BuildRequires:  GConf2-devel
+BuildRequires:  gnome-keyring-devel
+# Build tools
+BuildRequires:  desktop-file-utils
+BuildRequires:  gettext 
+BuildRequires:  intltool
+BuildRequires:  libxslt
+BuildRequires:  gnome-doc-utils
+BuildRequires:  libxml2
+Requires:       xorg-x11-server-utils
+Requires:       fortune-mod
 
 %description
 xfce4-session is the session manager for the Xfce desktop environment.
 
-%package devel
-Summary: Development files for xfce4-session
-Group: Development/Libraries
-Requires: xfce4-session >= %{version}
-Requires: libxfcegui4-devel >= %{version}
+%package        devel
+Summary:        Development files for xfce4-session
+Group:          Development/Libraries
+Requires:       xfce4-session >= %{version}
+Requires:       libxfce4ui-devel >= %{version}
 
-%description devel
+%description    devel
 Header files for the Xfce Session Manager.
 
-%package engines
-Summary: Additional engines for xfce4-session
-Group: User Interface/Desktops
-Requires: xfce4-session >= %{version}
+%package        engines
+Summary:        Additional engines for xfce4-session
+Group:          User Interface/Desktops
+Requires:       xfce4-session >= %{version}
 
-%description engines
+%description    engines
 Additional splash screen engines for the Xfce Session Manager.
 
+
 %prep
 %setup -q
-%patch0 -p1 -b .disable-tips
+%patch0 -p1 -b .hide-tips
 %patch1 -p1 -b .correct-shadows
-%patch2 -p1 -b .gnome-keyring
+
 
 %build
-%configure --enable-gnome --enable-final --disable-static
+%configure --disable-static --enable-gen-doc \
+    --enable-gnome \
+    --enable-libgnome-keyring \
+    --enable-session-screenshots \
+    --enable-panel-plugin
+    
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 %find_lang %{name}
 
+# install additional menu entry for xfce4-tips because we disabled autostart
+mv xfce4-tips/xfce4-tips-autostart.desktop xfce4-tips/xfce4-tips.desktop
+sed -i 's|Hidden=true|Hidden=false|g' xfce4-tips/xfce4-tips.desktop
+desktop-file-install --vendor="" \
+	--add-category="Documentation;X-XFCE;" \
+	--dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+	xfce4-tips/xfce4-tips.desktop
+	
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 /sbin/ldconfig
 
+
 %postun
 if [ $1 -eq 0 ] ; then
     touch --no-create %{_datadir}/icons/hicolor &>/dev/null
@@ -79,46 +107,56 @@ if [ $1 -eq 0 ] ; then
 fi
 /sbin/ldconfig
 
+
 %posttrans
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog ChangeLog.pre-xfce-devel NEWS README TODO
+%doc AUTHORS BUGS COPYING ChangeLog NEWS README TODO
+%doc doc/FAQ doc/NEWS.pre-4.3 doc/README.Kiosk
+%{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
+%config(noreplace) %{_sysconfdir}/xdg/autostart/xfce4-tips-autostart.desktop
 %{_bindir}/*
-%{_datadir}/applications/*
-%{_datadir}/icons/hicolor/*/apps/*.png
-%{_datadir}/icons/hicolor/scalable/apps/*.svg
-%{_datadir}/xfce4/doc/*/images/*
-%{_datadir}/xfce4/doc/*/*.html
-%dir %{_datadir}/xfce4/tips/
-%{_datadir}/xfce4/tips/tips
-%{_datadir}/xfce4/tips/tips.dat
 %{_libdir}/lib*.so.*
-%dir %{_libdir}/xfce4/splash/
-%dir %{_libdir}/xfce4/splash/engines
-%{_libdir}/xfce4/splash/engines/libmice.*
-%{_libexecdir}/xfsm-shutdown-helper
+%dir %{_libdir}/xfce4/session/
+%dir %{_libdir}/xfce4/session/splash-engines
+%{_libdir}/xfce4/session/splash-engines/libmice.so
+%{_libdir}/xfce4/session/xfsm-shutdown-helper
+%{_libdir}/xfce4/panel/plugins/libxfsm-logout-plugin.so
+%{_docdir}/%{name}/
+%{_datadir}/applications/*.desktop
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/xfce4/panel-plugins/*.desktop
+%{_datadir}/xfce4/tips/
 %{_mandir}/man1/*
-%{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
-%config(noreplace) %{_sysconfdir}/xdg/autostart/xfce4-tips-autostart.desktop
 
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*.pc
-%{_includedir}/xfce4/xfce4-session-4.6
+%{_includedir}/xfce4/xfce4-session-*/
 
 %files engines
 %defattr(-,root,root,-)
-%{_datadir}/themes/Default
-%{_libdir}/xfce4/splash/engines/libbalou.*
-%{_libdir}/xfce4/splash/engines/libsimple.*
-%{_libexecdir}/balou-*
+%{_libdir}/xfce4/session/splash-engines/libbalou.so
+%{_libdir}/xfce4/session/splash-engines/libsimple.so
+%{_libdir}/xfce4/session/balou-*
+%{_datadir}/themes/Default/balou/
 
 %changelog
-* Sat Dec 18 2010 Kevin Fenzi <kevin at tummy.com> - 4.6.2-2
-- Add patch to fix gnome-keyring handling. (fixes #663421)
+* Sun Jan 02 2011 Christoph Wickert <cwickert at fedoraproject.org> - 4.7.3-1
+- Update to 4.7.3
+
+* Fri Dec 03 2010 Christoph Wickert <cwickert at fedoraproject.org> - 4.7.2-1
+- Update to 4.7.2
+
+* Mon Nov 08 2010 Christoph Wickert <cwickert at fedoraproject.org> - 4.7.1-1
+- Update to 4.7.1
+
+* Sun Sep 05 2010 Christoph Wickert <cwickert at fedoraproject.org> - 4.7.0-1
+- Update to 4.7.0
 
 * Fri May 21 2010 Kevin Fenzi <kevin at tummy.com> - 4.6.2-1
 - Update to 4.6.2

More information about the scm-commits mailing list