rpms/fwbuilder/devel fwbuilder.spec,1.1,1.2
Warren Togami (wtogami)
fedora-extras-commits at redhat.com
Sun Jan 23 05:42:14 UTC 2005
- Previous message: rpms/fwbuilder/devel fwbuilder.desktop, NONE, 1.1 fwbuilder.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message: rpms/libfwbuilder/devel libfwbuilder.spec,1.1,1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: wtogami
Update of /cvs/extras/rpms/fwbuilder/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv29805
Modified Files:
fwbuilder.spec
Log Message:
minor spec cleanup
Index: fwbuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/devel/fwbuilder.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fwbuilder.spec 23 Jan 2005 05:40:01 -0000 1.1
+++ fwbuilder.spec 23 Jan 2005 05:42:12 -0000 1.2
@@ -1,19 +1,16 @@
Name: fwbuilder
Summary: Firewall Builder
Version: 2.0.5
-Release: 1
+Release: 2
License: GPL
-Group: "Applications/System"
-Packager: Steve Grubb <sgrubb at redhat.com>
-Url: http://www.fwbuilder.org/
+Group: Applications/System
+URL: http://www.fwbuilder.org/
Source: %{name}-%{version}.tar.gz
Source1: fwbuilder.desktop
Buildroot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: qt-devel >= 3.0.0
+BuildRequires: qt-devel >= 1:3.0.0
BuildRequires: desktop-file-utils
BuildRequires: libfwbuilder-devel = 2.0.5
-Requires: libfwbuilder = 2.0.5
-Provides: %name = %version
%description
Firewall Builder consists of a GUI and set of policy compilers for
@@ -30,13 +27,15 @@
%setup -q
%build
+[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
./configure --prefix=%{_prefix} --with-templatedir=%{_datadir}/fwbuilder
-make QTDIR=`cat qtdir` all
+make all
%install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
-make QTDIR=`cat qtdir` DDIR=$RPM_BUILD_ROOT install
-rm -fr $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}
+rm -rf $RPM_BUILD_ROOT
+[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
+make DDIR=$RPM_BUILD_ROOT 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
@@ -49,7 +48,7 @@
%{SOURCE1}
%clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
@@ -95,7 +94,7 @@
%package pf
Summary: Policy Compiler for OpenBSD PF
-Group: "Applications/System"
+Group: Applications/System
Requires: %{name} = %{version}-%{release}
%description pf
@@ -110,7 +109,7 @@
%package ipf
Summary: Policy Pompiler for ipfilter
-Group: "Applications/System"
+Group: Applications/System
Requires: %{name} = %{version}-%{release}
%description ipf
@@ -125,7 +124,7 @@
%package ipfw
Summary: Policy Compiler for ipfw
-Group: "Applications/System"
+Group: Applications/System
Requires: %{name} = %{version}-%{release}
%description ipfw
@@ -140,7 +139,7 @@
%package ipt
Summary: Policy Compiler for IPTables
-Group: "Applications/System"
+Group: Applications/System
Requires: %{name} = %{version}-%{release}
%description ipt
@@ -153,6 +152,9 @@
%{_mandir}/man1/fwb_ipt.1*
%changelog
+* Sat Jan 22 2005 Warren Togami <wtogami at redhat.com> 2.0.5-2
+- minor spec cleanup
+
* Sat Jan 22 2005 Steve Grubb <sgrubb at redhat.com> 2.0.5
- Created base spec file
- Previous message: rpms/fwbuilder/devel fwbuilder.desktop, NONE, 1.1 fwbuilder.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message: rpms/libfwbuilder/devel libfwbuilder.spec,1.1,1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list