[xfce4-panel] - Update to 4.7.7

Christoph Wickert cwickert at fedoraproject.org
Sat Jan 8 21:35:28 UTC 2011 

commit 667dea0d7cc571f0c7472c5f10d71a505847ff80
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Sat Jan 8 22:35:13 2011 +0100

    - Update to 4.7.7

 .gitignore       |    1 +
 sources          |    2 +-
 xfce4-panel.spec |  195 ++++++++++++++++++++++++++++++++---------------------
 3 files changed, 120 insertions(+), 78 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 197b706..31b215a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 xfce4-panel-4.6.4.tar.bz2
+/xfce4-panel-4.7.7.tar.bz2
diff --git a/sources b/sources
index d49f1c7..8fbc823 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-82f10a42aefca4cc26a6633e7478cc65  xfce4-panel-4.6.4.tar.bz2
+dabbc8ef3bb556cbdf22b375be008db7  xfce4-panel-4.7.7.tar.bz2
diff --git a/xfce4-panel.spec b/xfce4-panel.spec
index a763279..df97400 100644
--- a/xfce4-panel.spec
+++ b/xfce4-panel.spec
@@ -1,132 +1,173 @@
-%global xfceversion 4.6
-
-Summary: Next generation panel for Xfce
-Name: xfce4-panel
-Version: 4.6.4
-Release: 1%{?dist}
-License: GPLv2+ and LGPLv2+
-URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2
-Patch0: xfce4-panel-4.6.0-defaults.patch
-Patch1: xfce4-panel-4.6.1-multilib.patch
-Group: User Interface/Desktops
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Requires: libxfcegui4 >= %{xfceversion}
-Requires: xfce4-doc
-BuildRequires: libxfcegui4-devel >= %{xfceversion}
-BuildRequires: libxml2-devel >= 2.4.0
-BuildRequires: startup-notification-devel
-BuildRequires: gettext intltool
-BuildRequires: exo-devel >= 0.3.93
-BuildRequires: libwnck-devel
+%global xfceversion 4.7
+
+Name:           xfce4-panel
+Version:        4.7.7
+Release:        1%{?dist}
+Summary:        Next generation panel for Xfce
+
+Group:          User Interface/Desktops
+License:        GPLv2+ and LGPLv2+
+URL:            http://www.xfce.org/
+Source0:        http://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2
+# FIXME: do the patch once upstream has finalized the panel layout
+#Patch0:         xfce4-panel-4.7.6-defaults.patch
+BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+BuildRequires:  libxfce4ui-devel >= %{xfceversion}
+BuildRequires:  garcon-devel >= 0.1.4
+BuildRequires:  libxml2-devel >= 2.4.0
+BuildRequires:  startup-notification-devel
+BuildRequires:  exo-devel >= 0.3.93
+BuildRequires:  libwnck-devel
+BuildRequires:  gettext
+BuildRequires:  intltool
+BuildRequires:  desktop-file-utils
+BuildRequires:  gtk-doc
+Requires:       xfce4-doc
 
 # xfce4-iconbox isn't in Xfce 4.4
-Provides: xfce4-iconbox = %{version}-%{release}
-Obsoletes: xfce4-iconbox <= 4.2.3-4.fc6
+Provides:       xfce4-iconbox = %{version}-%{release}
+Obsoletes:      xfce4-iconbox <= 4.2.3-4.fc6
 # xfce4-systray isn't in Xfce 4.4
-Provides: xfce4-systray = %{version}-%{release}
-Obsoletes: xfce4-systray <= 4.2.3-3.fc6
+Provides:       xfce4-systray = %{version}-%{release}
+Obsoletes:      xfce4-systray <= 4.2.3-3.fc6
 # xfce4-toys isn't in Xfce 4.4
-Provides: xfce4-toys = %{version}-%{release}
-Obsoletes: xfce4-toys <= 4.2.3-3.fc6
+Provides:       xfce4-toys = %{version}-%{release}
+Obsoletes:      xfce4-toys <= 4.2.3-3.fc6
 # xfce4-trigger-launcher isn't in Xfce 4.4
-Provides: xfce4-trigger-launcher = %{version}-%{release}
-Obsoletes: xfce4-trigger-launcher <= 4.2.3-3.fc6
+Provides:       xfce4-trigger-launcher = %{version}-%{release}
+Obsoletes:      xfce4-trigger-launcher <= 4.2.3-3.fc6
 # xfce4-showdesktop-plugin isn't in Xfce 4.4
-Provides: xfce4-showdesktop-plugin = %{version}-%{release}
-Obsoletes: xfce4-showdesktop-plugin <= 0.4.0-7.fc6
+Provides:       xfce4-showdesktop-plugin = %{version}-%{release}
+Obsoletes:      xfce4-showdesktop-plugin <= 0.4.0-7.fc6
 # xfce4-taskbar-plugin isn't in Xfce 4.4
-Provides: xfce4-taskbar-plugin = %{version}-%{release}
-Obsoletes: xfce4-taskbar-plugin <= 0.2.2-7.fc6
+Provides:       xfce4-taskbar-plugin = %{version}-%{release}
+Obsoletes:      xfce4-taskbar-plugin <= 0.2.2-7.fc6
 # xfce4-windowlist-plugin isn't in Xfce 4.4
-Provides: xfce4-windowlist-plugin = %{version}-%{release}
-Obsoletes: xfce4-windowlist-plugin <= 0.1.0-7.fc6
+Provides:       xfce4-windowlist-plugin = %{version}-%{release}
+Obsoletes:      xfce4-windowlist-plugin <= 0.1.0-7.fc6
 # xfce4-xmms-plugin isn't in F11
-Provides: xfce4-xmms-plugin = 0.5.1-4
-Obsoletes: xfce4-xmms-plugin <= 0.5.1-3.fc11
+Provides:       xfce4-xmms-plugin = 0.5.1-4
+Obsoletes:      xfce4-xmms-plugin <= 0.5.1-3.fc11
 
 %description
 This package includes the panel for the Xfce desktop environment.
 
 %package devel
-Summary: Development headers for xfce4-panel
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: pkgconfig
-Requires: libxfce4util-devel >= %{xfceversion}
-Requires: libxfcegui4-devel >= %{xfceversion}
+Summary:        Development headers for xfce4-panel
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       pkgconfig
+Requires:       libxfce4util-devel >= %{xfceversion}
+Requires:       libxfce4ui-devel >= %{xfceversion}
 
 %description devel
 This package includes the header files you will need to build
 plugins for xfce4-panel.
 
+
 %prep
 %setup -q
+#%patch0 -p1 -b .default
 
-%patch0 -p1 -b .default
-%patch1 -p1 -b .multilib
 
 %build
-%configure
+%configure --enable-gtk-doc --disable-static
+# Remove rpaths
 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
+
+# The LD_LIBRARY_PATH hack is needed for --enable-gtk-doc
+# because lt-libxfce4panel-scan is linked against libxfce4panel
+export LD_LIBRARY_PATH=$( pwd )/libxfce4panel/.libs
+
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
-rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/panel-plugins/*.la
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
-# remove useless dummy files
-rm -f $RPM_BUILD_ROOT/%{_bindir}/xfce4-iconbox
-rm -f $RPM_BUILD_ROOT/%{_bindir}/xftaskbar4
-# we need to own these dirs
-mkdir -p $RPM_BUILD_ROOT/%{_libexecdir}/xfce4/panel-plugins
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/xfce4/panel-plugins
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+
+# remove duplicate docs
+rm -f $RPM_BUILD_ROOT/%{_docdir}/xfce4-panel/README.gtkrc-2.0
+
+# FIXME: We need to own these dirs until all plugins are ported to Xfce 4.8
+mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/xfce4/panel-plugins
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/xfce4/panel-plugins
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/xfce4/panel-plugins
+
 %find_lang %{name}
 
+desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/panel-desktop-handler.desktop
+desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/panel-preferences.desktop
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
                                                                                           
+
 %post
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
 /sbin/ldconfig
 
+
 %postun
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
+
 /sbin/ldconfig
 
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc README ChangeLog NEWS COPYING AUTHORS
-%dir %{_sysconfdir}/xdg/xfce4/panel/
-%config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/*.rc
-%config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/panels.xml
-
-%{_libdir}/xfce4/panel-plugins/
-%{_libdir}/libxfce4panel.so.*
+%doc COPYING AUTHORS ChangeLog NEWS README docs/README.gtkrc-2.0
+%doc %{_docdir}/%{name}
+%config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/default.xml
 %{_bindir}/*
-%{_libexecdir}/xfce4/panel-plugins/
-%{_datadir}/icons/hicolor/*/*/*.png
-%doc %{_datadir}/xfce4/doc/*/images/*
-%doc %{_datadir}/xfce4/doc/*/*.html
-%{_datadir}/xfce4/panel-plugins/
-%{_datadir}/applications/xfce4-panel-manager.desktop
+%{_libdir}/libxfce4panel-*.so.*
+%{_libdir}/xfce4/panel/
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/xfce4/panel/
+%{_datadir}/applications/*.desktop
+# FIXME: Remove these when no longer needed
+%dir %{_libexecdir}/xfce4/panel-plugins/
+%dir %{_libdir}/xfce4/panel-plugins
+%dir %{_datadir}/xfce4/panel-plugins
 
 %files devel
 %defattr(-, root,root,-)
 %{_libdir}/pkgconfig/*
-%{_libdir}/libxfce4panel.so
-%doc %{_datadir}/gtk-doc/html/libxfce4panel
-%{_includedir}/xfce4/libxfce4panel
+%{_libdir}/libxfce4panel-*.so
+%doc %{_datadir}/gtk-doc/html/libxfce4panel-*/
+%{_includedir}/xfce4/libxfce4panel-*/
 
 %changelog
+* Sun Jan 02 2011 Christoph Wickert <cwickert at fedoraproject.org> - 4.7.7-1
+- Update to 4.7.7
+
+* Sun Dec 19 2010 Christoph Wickert <cwickert at fedoraproject.org> - 4.7.6-2
+- Own %%{_libexecdir}/xfce4/panel-plugins/ for now
+
+* Sun Dec 05 2010 Christoph Wickert <cwickert at fedoraproject.org> - 4.7.6-1
+- Update to 4.7.6
+
+* Sat Dec 04 2010 Christoph Wickert <cwickert at fedoraproject.org> - 4.7.5-1
+- Update to 4.7.5
+
+* Mon Nov 08 2010 Christoph Wickert <cwickert at fedoraproject.org> - 4.7.4-1
+- Update to 4.7.4
+
+* Sun Sep 05 2010 Christoph Wickert <cwickert at fedoraproject.org> - 4.7.3-1
+- Update to 4.7.3
+- Update icon-cache scriptlets
+
 * Fri May 21 2010 Kevin Fenzi <kevin at tummy.com> - 4.6.4-1
 - Update to 4.6.4

More information about the scm-commits mailing list