diff --git a/.cvsignore b/.cvsignore index 28861b8..ab30344 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -fbpanel-4.12.tgz +fbpanel-5.6.tbz2 diff --git a/fbpanel-4.12-icon.patch b/fbpanel-4.12-icon.patch deleted file mode 100644 index bc8cf90..0000000 --- a/fbpanel-4.12-icon.patch +++ /dev/null @@ -1,59 +0,0 @@ ---- config/default.cfg 2007-07-31 01:59:09.000000000 +0200 -+++ config/default.patch 2008-07-04 16:14:33.000000000 +0200 -@@ -137,7 +137,7 @@ - Plugin { - type = menu - config { -- image = PREFIX/share/fbpanel/images/star.png -+ image = PREFIX/share/icons/Fedora/32x32/places/start-here.png - systemmenu { - } - separator { -@@ -153,12 +153,12 @@ - icon = gnome-terminal - name = terminal - #image = PREFIX/share/fbpanel/images/gnome_terminal.svg -- action = xterm -+ action = gnome-terminal - } - item { -- icon = gnome-emacs -- name = emacs -- action = emacs -+ icon = accessories-text-editor -+ name = texteditor -+ action = gedit - } - - } -@@ -180,14 +180,14 @@ - button { - icon = gnome-fs-home - #image = PREFIX/share/fbpanel/images/file-manager.svg -- tooltip = ROX file manager -- action = rox -+ tooltip = Nautilus file manager -+ action = nautilus - } - - button { - icon = gnome-terminal - tooltip = Terminal -- action = xterm -+ action = gnome-terminal - } - - button { -@@ -196,9 +196,9 @@ - action =firefox - } - button { -- icon = gnome-emacs -- tooltip = Emacs -- action = emacs -+ icon = accessories-text-editor -+ tooltip = Texteditor -+ action = gedit - } - - } diff --git a/fbpanel-4.12-libdir.patch b/fbpanel-4.12-libdir.patch deleted file mode 100644 index 1b4d69b..0000000 --- a/fbpanel-4.12-libdir.patch +++ /dev/null @@ -1,92 +0,0 @@ -Patch by Robert Scheck for fbpanel >= 4.12, to add some -changes to get the libraries into %{_libdir}/%{name} rather %{_datadir}/%{name}. It -doesn't change anything once --libdir parameter isn't used, so it has full legacy -compatibility and maybe gets applied by upstream as well. - -Usage example of this patch for the use inside of a spec file e.g. for Fedora is: - ./configure --prefix=%{_prefix} --libdir=%{_lib} -Don't use %{_libdir} for ./configure, just %{_lib} but everywhere else %{_libdir} -can be used. RPM macro %{_lib} normally expands to "lib" on 32 bit systems and to -"lib64" on 64 bit systems. The regular internal usage case is $(PREFIX)/$(LIBDIR) -which results in /usr/lib or /usr/lib64 depending on the CPU architecture. - ---- fbpanel-4.12/configure 2007-04-24 14:40:45.000000000 +0200 -+++ fbpanel-4.12/configure.libdir 2008-06-15 20:44:22.000000000 +0200 -@@ -9,11 +9,13 @@ - echo " /bin - will hold all binaries" - echo " /share/fbpanel - config files, pixmaps etc" - echo " default is /usr" -+ echo "--libdir=[share|lib|lib64] - specify path for libraries" - echo "--devel - enable devel mode: no optimization + debug symbols" - echo "--cpu=[on|off] - enable linux cpu monitor plugin" - } - - PREFIX="/usr" -+LIBDIR="share" - PLUGIN_CPU="on" - while [ $# -gt 0 ]; do - case $1 in -@@ -24,6 +26,9 @@ - --prefix=*) - PREFIX=`echo $1 | sed 's/--prefix=//'` - ;; -+ --libdir=*) -+ LIBDIR=`echo $1 | sed 's/--libdir=//'` -+ ;; - --devel) - DEVEL=1 - ;; -@@ -50,9 +55,11 @@ - echo "creating config.h" - echo "//created by ./configure script" > config.h - echo "#define PREFIX \"$PREFIX\"" >> config.h -+echo "#define LIBDIR \"$LIBDIR\"" >> config.h - - - echo "creating Makefile.config" - echo "PREFIX:=$PREFIX" > Makefile.config -+echo "LIBDIR:=$LIBDIR" >> Makefile.config - echo "DEVEL:=$DEVEL" >> Makefile.config - echo "PLUGIN_CPU:=$PLUGIN_CPU" >> Makefile.config ---- fbpanel-4.12/plugin.c 2007-04-21 13:28:25.000000000 +0200 -+++ fbpanel-4.12/plugin.c.libdir 2008-06-15 20:46:51.000000000 +0200 -@@ -137,7 +137,7 @@ - LOG(LOG_INFO, " %s ... %s\n", str->str, m ? "ok" : "no"); - if (!m) { - DBG("error is %s\n", g_module_error()); -- g_string_printf(str, "%s/share/fbpanel/plugins/%s.so", PREFIX, type); -+ g_string_printf(str, "%s/%s/fbpanel/plugins/%s.so", PREFIX, LIBDIR, type); - m = g_module_open(str->str, G_MODULE_BIND_LAZY); - LOG(LOG_INFO, " %s ... %s\n", str->str, m ? "ok" : "no"); - if (!m) { ---- fbpanel-4.12/plugins/Makefile 2007-05-23 23:38:27.000000000 +0200 -+++ fbpanel-4.12/plugins/Makefile.libdir 2008-06-15 20:45:01.000000000 +0200 -@@ -47,9 +47,9 @@ - - ifeq (0,$(STATIC_PLUGINS)) - install: -- install -d $(PREFIX)/share/fbpanel/plugins -- install -m 644 $(SOBJ) $(PREFIX)/share/fbpanel/plugins -+ install -d $(PREFIX)/$(LIBDIR)/fbpanel/plugins -+ install -m 644 $(SOBJ) $(PREFIX)/$(LIBDIR)/fbpanel/plugins - - uninstall: -- $(RM) -r $(PREFIX)/share/fbpanel/plugins/ -+ $(RM) -r $(PREFIX)/$(LIBDIR)/fbpanel/plugins/ - endif ---- fbpanel-4.12/systray/Makefile 2007-04-21 13:28:25.000000000 +0200 -+++ fbpanel-4.12/systray/Makefile.libdir 2008-06-15 20:47:16.000000000 +0200 -@@ -41,10 +41,10 @@ - - ifeq (0,$(STATIC_PLUGINS)) - install: -- install -d $(PREFIX)/share/fbpanel/plugins -- install -m 644 $(TARGET) $(PREFIX)/share/fbpanel/plugins -+ install -d $(PREFIX)/$(LIBDIR)/fbpanel/plugins -+ install -m 644 $(TARGET) $(PREFIX)/$(LIBDIR)/fbpanel/plugins - - uninstall: -- $(RM) $(PREFIX)/share/fbpanel/plugins/$(TARGET) -+ $(RM) $(PREFIX)/$(LIBDIR)/fbpanel/plugins/$(TARGET) - - endif diff --git a/fbpanel-5.6-default-config.patch b/fbpanel-5.6-default-config.patch new file mode 100644 index 0000000..8730b8a --- /dev/null +++ b/fbpanel-5.6-default-config.patch @@ -0,0 +1,70 @@ +--- fbpanel-5.6.orig/data/config/default.in 2009-06-05 13:27:37.000000000 +0200 ++++ fbpanel-5.6/data/config/default.in 2010-02-08 00:57:37.000000000 +0100 +@@ -139,36 +139,36 @@ + Plugin { + type = menu + config { +- icon = logo ++ icon = start-here + systemmenu { + } + separator { + } + menu { + name = Computer +- icon = gnome-fs-home ++ icon = gnome-dev-computer + + item { + name = Terminal + icon = gnome-terminal +- action = xterm ++ action = gnome-terminal + } + item { + name = Lock Display + icon = gnome-lockscreen +- action = slock ++ action = xdg-screensaver lock + } + separator { + } + item { + name = Reboot + icon = gnome-session-reboot +- action = sudo reboot ++ action = reboot + } + item { + name = Shutdown + icon = gnome-session-halt +- action = sudo shutdown -h now ++ action = poweroff + } + item { + name = logout +@@ -194,20 +194,20 @@ + config { + button { + icon = gnome-fs-home +- tooltip = ROX file manager +- action = rox ++ tooltip = File manager ++ action = nautilus + } + + button { + icon = gnome-terminal + tooltip = Terminal +- action = xterm ++ action = gnome-terminal + } + + button { + icon = mozilla-firefox + tooltip = Firefox web browser +- action =firefox ++ action = firefox + } + + } diff --git a/fbpanel.spec b/fbpanel.spec index 249a391..ab6369f 100644 --- a/fbpanel.spec +++ b/fbpanel.spec @@ -1,6 +1,6 @@ Name: fbpanel -Version: 4.12 -Release: 8%{?dist} +Version: 5.6 +Release: 1%{?dist} Summary: A lightweight X11 desktop panel Group: User Interface/Desktops @@ -8,73 +8,70 @@ Group: User Interface/Desktops # Some plugins (cpu.so, pager.so, tray.so) are under GPLv2+ License: LGPLv2+ and GPLv2+ URL: http://fbpanel.sourceforge.net -Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz -Source1: %{name}.desktop -Patch: fbpanel-4.12-libdir.patch -Patch1: fbpanel-4.12-icon.patch +Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tbz2 +Patch0: fbpanel-5.6-default-config.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel libXpm-devel libXmu-devel desktop-file-utils %description fbpanel is a lightweight X11 desktop panel. It works with any ICCCM / NETWM -compliant window manager such as sawfish, metacity, openbox , xfwm4, or KDE. +compliant window manager such as sawfish, metacity, openbox, xfwm4, or KDE. It features tasklist, pager, launchbar, clock, menu and systray. %prep %setup -q -%patch -p1 -b .libdir -%patch1 -p0 +%patch0 -p1 -b .orig +# preserve timestamps during install +sed -i.stamp -e 's|install -m|install -p -m|' scripts/install.sh -sed -i.stamp -e 's|install -m|install -p -m|' \ - Makefile */Makefile -sed -i.strip -e 's|strip|true strip|' \ - Makefile */Makefile %build -./configure --prefix=%{_prefix} --libdir=%{_lib} -make \ - %{?_smp_mflags} \ +# %%configure macro doesn't work +./configure --prefix=%{_prefix} --libdir=%{_libdir} +make %{?_smp_mflags} \ Q= \ CFLAGS="${RPM_OPT_FLAGS}" %install rm -rf $RPM_BUILD_ROOT -make install PREFIX=$RPM_BUILD_ROOT%{_prefix} +make install DESTDIR=$RPM_BUILD_ROOT -# desktop file stuff -desktop-file-install --vendor="fedora" \ - --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ - %{SOURCE1} -# icon -mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps +# man page +mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 +install -pm 644 data/man/%{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/ -install -p -m 0644 config/images/star.png \ - $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps/%{name}.png +# change some icon names that were also changed in the default panel config +mv $RPM_BUILD_ROOT%{_datadir}/%{name}/images/logo.png \ + $RPM_BUILD_ROOT%{_datadir}/%{name}/images/start-here.png +mv $RPM_BUILD_ROOT%{_datadir}/%{name}/images/gnome-fs-home.svg \ + $RPM_BUILD_ROOT%{_datadir}/%{name}/images/gnome-dev-computer.svg find $RPM_BUILD_ROOT%{_libdir}/%{name} -name \*.so -print0 | \ xargs -0 chmod 0755 + %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 || : %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 +%posttrans +gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + + %files %defattr(-,root,root,-) %doc CHANGELOG COPYING CREDITS README @@ -82,11 +79,14 @@ fi %{_libdir}/%{name} %{_datadir}/%{name} %{_mandir}/man1/%{name}.1.* -%{_datadir}/applications/fedora-%{name}.desktop -%{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Sun Feb 07 2010 Christoph Wickert - 5.6-1 +- Update to 5.6 +- Update icon-cache scriptlets +- Remove useless desktop file + * Fri Jul 24 2009 Fedora Release Engineering - 4.12-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index 229ce87..07cfa05 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -12528e7b2936a3548840fe01acaf39f5 fbpanel-4.12.tgz +395c59cec6531da8113ddd7fd650bbbb fbpanel-5.6.tbz2