[fbpanel] - Update to 6.1 - Require xdg-utils for screenlocking - Add patch to make sure default applications
Christoph Wickert
cwickert at fedoraproject.org
Sun Nov 28 16:55:59 UTC 2010
commit 86e7ecee93b0893264886d3dd047e9767bed48b5
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date: Sun Nov 28 17:56:06 2010 +0100
- Update to 6.1
- Require xdg-utils for screenlocking
- Add patch to make sure default applications are installed
.gitignore | 1 +
fbpanel-5.6-default-config.patch | 70 --------------------------------
fbpanel-5.6-dsofix.patch | 12 -----
fbpanel-6.1-default-applications.patch | 25 +++++++++++
fbpanel-6.1-default-config.patch | 56 +++++++++++++++++++++++++
fbpanel.spec | 56 ++++++++++++++++---------
sources | 2 +-
7 files changed, 119 insertions(+), 103 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ab30344..d3a2ba1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
fbpanel-5.6.tbz2
+/fbpanel-6.1.tbz2
diff --git a/fbpanel-6.1-default-applications.patch b/fbpanel-6.1-default-applications.patch
new file mode 100644
index 0000000..302a419
--- /dev/null
+++ b/fbpanel-6.1-default-applications.patch
@@ -0,0 +1,25 @@
+--- fbpanel-6.1.orig/exec/make_profile.in 2010-03-24 10:58:10.000000000 +0100
++++ fbpanel-6.1/exec/make_profile.in 2010-11-28 17:08:36.656335297 +0100
+@@ -47,19 +47,19 @@
+ [ -r "$spdir/$1" ] || return 1
+
+ local browser terminal filer
+- for browser in x-www-browser firefox opera; do
++ for browser in firefox seamonkey midori konqueror; do
+ if which $browser 2> /dev/null > /dev/null; then
+ opt="$opt -e s/x-www-browser/$browser/"
+ break
+ fi
+ done
+- for terminal in x-terminal urxvt gnome-terminal; do
++ for terminal in gnome-terminal Terminal lxterminal lilyterm sakura urxvt xterm konsole; do
+ if which $terminal 2> /dev/null > /dev/null; then
+ opt="$opt -e s/x-terminal/$terminal/"
+ break
+ fi
+ done
+- for filer in x-file-manager thunar pcmanfm rox; do
++ for filer in nautilus thunar pcmanfm dolphin rox; do
+ if which $filer 2> /dev/null > /dev/null; then
+ opt="$opt -e s/x-file-manager/$filer/"
+ break
diff --git a/fbpanel-6.1-default-config.patch b/fbpanel-6.1-default-config.patch
new file mode 100644
index 0000000..90e3a31
--- /dev/null
+++ b/fbpanel-6.1-default-config.patch
@@ -0,0 +1,56 @@
+--- fbpanel-6.1.orig/data/config/default.in 2010-05-12 20:30:00.000000000 +0200
++++ fbpanel-6.1/data/config/default.in 2010-11-28 17:18:07.070464321 +0100
+@@ -141,8 +141,7 @@
+ type = menu
+ config {
+ IconSize = 22
+- #icon = start-here
+- icon = logo
++ icon = start-here
+ systemmenu {
+ }
+ separator {
+@@ -158,24 +157,24 @@
+ }
+ item {
+ name = Lock Display
+- icon = gnome-lockscreen
+- action = slock
++ icon = system-lock-screen
++ action = xdg-screensaver lock
+ }
+ separator {
+ }
+ item {
+ name = Reboot
+- icon = gnome-session-reboot
+- action = sudo reboot
++ icon = system-reboot
++ action = reboot
+ }
+ item {
+ name = Shutdown
+- icon = gnome-session-halt
+- action = sudo shutdown -h now
++ icon = system-shutdown
++ action = poweroff
+ }
+ item {
+- name = logout
+- icon = gnome-session-logout
++ name = Logout
++ icon = system-log-out
+ action = %%libexecdir%%/fbpanel/xlogout
+ }
+ }
+@@ -313,10 +312,6 @@
+ }
+ }
+
+-plugin {
+- type = volume
+-}
+-
+ #plugin {
+ # type = battery
+ #}
diff --git a/fbpanel.spec b/fbpanel.spec
index 7b81545..2ca3a61 100644
--- a/fbpanel.spec
+++ b/fbpanel.spec
@@ -1,6 +1,6 @@
Name: fbpanel
-Version: 5.6
-Release: 2%{?dist}
+Version: 6.1
+Release: 1%{?dist}
Summary: A lightweight X11 desktop panel
Group: User Interface/Desktops
@@ -9,12 +9,14 @@ Group: User Interface/Desktops
License: LGPLv2+ and GPLv2+
URL: http://fbpanel.sourceforge.net
Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tbz2
-Patch0: fbpanel-5.6-dsofix.patch
+Patch0: fbpanel-6.1-dsofix.patch
# distro specific patches
-Patch10: fbpanel-5.6-default-config.patch
+Patch10: fbpanel-6.1-default-config.patch
+Patch11: fbpanel-6.1-default-applications.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel libXpm-devel libXmu-devel desktop-file-utils
+Requires: xdg-utils
%description
fbpanel is a lightweight X11 desktop panel. It works with any ICCCM / NETWM
@@ -24,17 +26,22 @@ It features tasklist, pager, launchbar, clock, menu and systray.
%prep
%setup -q
%patch0 -p1 -b .dsofix
-%patch10 -p1 -b .orig
+%patch10 -p1 -b .default-config
+%patch11 -p1 -b .default-applications
# preserve timestamps during install
-sed -i.stamp -e 's|install -m|install -p -m|' scripts/install.sh
+sed -i.timstamps -e 's|install -m|install -p -m|' scripts/install.sh
+# honor optflags
+sed -i.optflags -e 's|-fPIC|-fPIC ${RPM_OPT_FLAGS}|' scripts/custom.sh
%build
# %%configure macro doesn't work
-./configure --prefix=%{_prefix} --libdir=%{_libdir}
-make %{?_smp_mflags} \
- Q= \
- CFLAGS="${RPM_OPT_FLAGS}"
+./configure --prefix=%{_prefix} \
+ --libdir=%{_libdir} \
+ --libexecdir=%{_libexecdir} \
+ --datadir=%{_datadir} \
+ --mandir=%{_mandir}
+make %{?_smp_mflags} cflagsx="${RPM_OPT_FLAGS}"
%install
@@ -42,18 +49,21 @@ rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# man page
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-install -pm 644 data/man/%{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/
+install -Dpm 644 data/man/%{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1
# 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
+ $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
+mv $RPM_BUILD_ROOT%{_datadir}/%{name}/images/gnome-session-halt.png \
+ $RPM_BUILD_ROOT%{_datadir}/%{name}/images/system-shutdown.png
-find $RPM_BUILD_ROOT%{_libdir}/%{name} -name \*.so -print0 | \
- xargs -0 chmod 0755
+mv $RPM_BUILD_ROOT%{_datadir}/%{name}/images/gnome-session-reboot.png \
+ $RPM_BUILD_ROOT%{_datadir}/%{name}/images/system-reboot.png
+
+# volume plugin is not working and prevents starting of fbpanel, lets remove it.
+# https://sourceforge.net/tracker/?func=detail&aid=3121295&group_id=66031&atid=513125
+rm $RPM_BUILD_ROOT%{_libdir}/%{name}/volume.so
%clean
@@ -77,14 +87,20 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files
%defattr(-,root,root,-)
-%doc CHANGELOG COPYING CREDITS README
+%doc CHANGELOG COPYING CREDITS README NOTES
%{_bindir}/%{name}
-%{_libdir}/%{name}
-%{_datadir}/%{name}
+%{_libdir}/%{name}/
+%{_libexecdir}/%{name}/
+%{_datadir}/%{name}/
%{_mandir}/man1/%{name}.1.*
%changelog
+* Sun Nov 28 2010 Christoph Wickert <cwickert at fedoraproject.org> - 6.1-1
+- Update to 6.1
+- Require xdg-utils for screenlocking
+- Add patch to make sure default applications are installed
+
* Thu Feb 25 2010 Christoph Wickert <cwickert at fedoraproject.org> - 5.6-2
- Add patch to fix DSO linking (#565202)
diff --git a/sources b/sources
index 07cfa05..14a088d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-395c59cec6531da8113ddd7fd650bbbb fbpanel-5.6.tbz2
+80ca0c64195b30587cfcb8c2cd9887a0 fbpanel-6.1.tbz2
More information about the scm-commits
mailing list