rpms/fbpanel/devel fbpanel-5.6-default-config.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 fbpanel.spec, 1.4, 1.5 sources, 1.2, 1.3 fbpanel-4.12-icon.patch, 1.1, NONE fbpanel-4.12-libdir.patch, 1.1, NONE
Christoph Wickert
cwickert at fedoraproject.org
Mon Feb 8 00:42:52 UTC 2010
Author: cwickert
Update of /cvs/pkgs/rpms/fbpanel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28010
Modified Files:
.cvsignore fbpanel.spec sources
Added Files:
fbpanel-5.6-default-config.patch
Removed Files:
fbpanel-4.12-icon.patch fbpanel-4.12-libdir.patch
Log Message:
* Sun Feb 07 2010 Christoph Wickert <cwickert at fedoraproject.org> - 5.6-1
- Update to 5.6
- Update icon-cache scriptlets
- Remove useless desktop file
fbpanel-5.6-default-config.patch:
default.in | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
--- NEW FILE fbpanel-5.6-default-config.patch ---
--- 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
}
}
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fbpanel/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 19 Jun 2008 14:23:48 -0000 1.2
+++ .cvsignore 8 Feb 2010 00:42:51 -0000 1.3
@@ -1 +1 @@
-fbpanel-4.12.tgz
+fbpanel-5.6.tbz2
Index: fbpanel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fbpanel/devel/fbpanel.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- fbpanel.spec 24 Jul 2009 22:32:04 -0000 1.4
+++ fbpanel.spec 8 Feb 2010 00:42:52 -0000 1.5
@@ -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
-
-install -p -m 0644 config/images/star.png \
- $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
+# man page
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+install -pm 644 data/man/%{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/
+
+# 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 <cwickert at fedoraproject.org> - 5.6-1
+- Update to 5.6
+- Update icon-cache scriptlets
+- Remove useless desktop file
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.12-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fbpanel/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 19 Jun 2008 14:23:48 -0000 1.2
+++ sources 8 Feb 2010 00:42:52 -0000 1.3
@@ -1 +1 @@
-12528e7b2936a3548840fe01acaf39f5 fbpanel-4.12.tgz
+395c59cec6531da8113ddd7fd650bbbb fbpanel-5.6.tbz2
--- fbpanel-4.12-icon.patch DELETED ---
--- fbpanel-4.12-libdir.patch DELETED ---
More information about the scm-commits
mailing list