rpms/fwbuilder/FC-4 .cvsignore, 1.5, 1.6 fwbuilder.desktop, 1.1, 1.2 fwbuilder.spec, 1.10, 1.11 sources, 1.5, 1.6

[Ralf Ertzinger (ertzing)]

Author: ertzing

Update of /cvs/extras/rpms/fwbuilder/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1714

Modified Files:
	.cvsignore fwbuilder.desktop fwbuilder.spec sources 
Log Message:
Fixes for BZ165308


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Feb 2006 17:54:26 -0000	1.5
+++ .cvsignore	8 Feb 2006 14:25:21 -0000	1.6
@@ -1,2 +1 @@
-fwbuilder.desktop
 fwbuilder-2.0.10.tar.gz


Index: fwbuilder.desktop
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/FC-4/fwbuilder.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fwbuilder.desktop	23 Jan 2005 05:40:01 -0000	1.1
+++ fwbuilder.desktop	8 Feb 2006 14:25:21 -0000	1.2
@@ -2,9 +2,9 @@
 Encoding=UTF-8
 Name=Firewall Builder
 Comment=Design IPTables Firewall Rules
-Icon=/usr/share/pixmaps/fwbuilder/firewall.png
-Categories=Application;SystemSetup
-Exec=/usr/bin/fwbuilder
+Icon=fwbuilder
+Categories=System;Settings;Security;Qt;
+Exec=fwbuilder
 Type=Application
 StartupNotify=true
 Terminal=false


Index: fwbuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/FC-4/fwbuilder.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- fwbuilder.spec	5 Feb 2006 17:54:26 -0000	1.10
+++ fwbuilder.spec	8 Feb 2006 14:25:21 -0000	1.11
@@ -1,7 +1,7 @@
 Name:           fwbuilder
 Summary:        Firewall Builder
 Version:        2.0.10
-Release:        1%dist
+Release:        2%dist
 
 License:        GPL
 Group:          Applications/System
@@ -44,12 +44,11 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
-make DDIR=$RPM_BUILD_ROOT install
+make DDIR=$RPM_BUILD_ROOT STRIPPROG=/bin/true install
 rm -rf $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}
 
 # Add an icon for the menu system
-mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/fwbuilder
-install -c -m644 src/gui/icons/firewall.png $RPM_BUILD_ROOT/usr/share/pixmaps/fwbuilder
+install -Dpm 644 src/gui/icons/firewall_48.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/fwbuilder.png
 
 # Add menu entry
 desktop-file-install --vendor fedora               \
@@ -60,18 +59,18 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor >/dev/null 2>&1 || :
+
+%postun
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor >/dev/null 2>&1 || :
+
+
 %files
 %defattr(-,root,root)
-%dir %{_datadir}/fwbuilder
-%dir %{_datadir}/pixmaps/fwbuilder
-%{_datadir}/fwbuilder/locale/*
-%{_datadir}/fwbuilder/platform/*
-%{_datadir}/fwbuilder/os/*
-%{_datadir}/fwbuilder/resources.xml
-%{_datadir}/fwbuilder/objects_init.xml
-%{_datadir}/fwbuilder/templates.xml
+%{_datadir}/fwbuilder
 %{_datadir}/applications/*.desktop
-%{_datadir}/pixmaps/fwbuilder/firewall.png
+%{_datadir}/icons/hicolor/*/apps/fwbuilder.png
 %{_bindir}/fwbuilder
 %{_bindir}/fwblookup
 %{_bindir}/fwbedit
@@ -168,6 +167,13 @@
 %{_mandir}/man1/fwb_ipt.1*
 
 %changelog
+* Wed Feb 08 2006 Ralf Ertzinger <ralf at skytale.net> 2.0.10-2
+- Fixes for BZ165308 (thanks to Ville Skyttä)
+  - Don't strip binaries, fixes debuginfo
+  - Bring desktop entry categories up to date, so the entry is actually shown
+  - Make icon themeable
+  - Own all installed dirs
+
 * Sun Feb 05 2006 Ralf Ertzinger <ralf at skytale.net> 2.0.10-1 
 - Update to 2.0.10
 - Spec file cleanup


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Feb 2006 17:54:26 -0000	1.5
+++ sources	8 Feb 2006 14:25:21 -0000	1.6
@@ -1,2 +1 @@
-8047b8aabc56f1005f7e551278083922  fwbuilder.desktop
 3a0946ed322df40be9814124ac7a9cfd  fwbuilder-2.0.10.tar.gz