rpms/fwbuilder/devel .cvsignore, 1.4, 1.5 fwbuilder.spec, 1.9, 1.10 sources, 1.4, 1.5

Ralf Ertzinger (ertzing) fedora-extras-commits at redhat.com
Sun Feb 5 17:40:23 UTC 2006


Author: ertzing

Update of /cvs/extras/rpms/fwbuilder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1232

Modified Files:
	.cvsignore fwbuilder.spec sources 
Log Message:
- Update to 2.0.10
- Spec file cleanup



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	13 Jul 2005 16:42:53 -0000	1.4
+++ .cvsignore	5 Feb 2006 17:40:22 -0000	1.5
@@ -1,4 +1,2 @@
-fwbuilder-2.0.5.tar.gz
-fwbuilder-2.0.6.tar.gz
-fwbuilder-2.0.8.tar.gz
 fwbuilder.desktop
+fwbuilder-2.0.10.tar.gz


Index: fwbuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/devel/fwbuilder.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- fwbuilder.spec	13 Jul 2005 16:42:53 -0000	1.9
+++ fwbuilder.spec	5 Feb 2006 17:40:22 -0000	1.10
@@ -1,17 +1,17 @@
 Name:           fwbuilder
 Summary:        Firewall Builder
-Version:        2.0.8
-Release: 	1
+Version:        2.0.10
+Release:        1%dist
 
 License:        GPL
 Group:          Applications/System
 URL:            http://www.fwbuilder.org/
 Source:         %{name}-%{version}.tar.gz
-Source1:	fwbuilder.desktop
+Source1:        fwbuilder.desktop
 Buildroot:      %{_tmppath}/%{name}-%{version}-root
 BuildRequires:  qt-devel >= 1:3.0.0
-BuildRequires:	desktop-file-utils
-BuildRequires:  libfwbuilder-devel = 2.0.8
+BuildRequires:  desktop-file-utils
+BuildRequires:  libfwbuilder-devel = 2.0.10
 
 %description
 Firewall Builder consists of a GUI and set of policy compilers for
@@ -29,7 +29,16 @@
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
-./configure --prefix=%{_prefix}	--with-templatedir=%{_datadir}/fwbuilder
+#
+# configure does not pass our CXXFLAGS to the build process,
+# which kind of sucks.
+# There has to be a less ugly way to do this.
+#
+perl -pi -e 's|(QMAKE_CXXFLAGS_.*)|$1 \@CXXFLAGS\@|' qmake.inc.in
+
+CXXFLAGS="${RPM_OPT_FLAGS} -ffriend-injection" %configure \
+    --with-templatedir=%{_datadir}/fwbuilder \
+    --disable-dependency-tracking
 make all
 
 %install
@@ -43,9 +52,9 @@
 install -c -m644 src/gui/icons/firewall.png $RPM_BUILD_ROOT/usr/share/pixmaps/fwbuilder
 
 # Add menu entry
-desktop-file-install --vendor system               \
+desktop-file-install --vendor fedora               \
   --dir $RPM_BUILD_ROOT/%{_datadir}/applications   \
-  --add-category X-Red-Hat-Base                    \
+  --add-category X-Fedora                          \
   %{SOURCE1}
 
 %clean
@@ -159,6 +168,10 @@
 %{_mandir}/man1/fwb_ipt.1*
 
 %changelog
+* Sun Feb 05 2006 Ralf Ertzinger <ralf at skytale.net> 2.0.10-1 
+- Update to 2.0.10
+- Spec file cleanup
+
 * Wed Jul 13 2005 Steve Grubb <sgrubb at redhat.com> 2.0.8-1
 - New upstream version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Jul 2005 16:42:53 -0000	1.4
+++ sources	5 Feb 2006 17:40:22 -0000	1.5
@@ -1,2 +1,2 @@
-37d4266b95967c3d4295ec5efdfa0c23  fwbuilder-2.0.8.tar.gz
 8047b8aabc56f1005f7e551278083922  fwbuilder.desktop
+3a0946ed322df40be9814124ac7a9cfd  fwbuilder-2.0.10.tar.gz




More information about the scm-commits mailing list