rpms/libfwbuilder/devel libfwbuilder.spec,1.1,1.2

[Warren Togami (wtogami)]

Author: wtogami

Update of /cvs/extras/rpms/libfwbuilder/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv29864

Modified Files:
	libfwbuilder.spec 
Log Message:
spec cleanup



Index: libfwbuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/libfwbuilder/devel/libfwbuilder.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libfwbuilder.spec	23 Jan 2005 05:37:37 -0000	1.1
+++ libfwbuilder.spec	23 Jan 2005 05:43:00 -0000	1.2
@@ -1,25 +1,23 @@
 Name:           libfwbuilder
 Summary: 	Firewall Builder API
 Version:        2.0.5
-Release:        1
+Release:        2
 License: 	GPL
-Group:  	"System Environment/Libraries"
-Packager:       Steve Grubb <sgrubb at redhat.com>
+Group:  	System Environment/Libraries
 Url: 		http://www.fwbuilder.org/
 Source: 	%{name}-%{version}.tar.gz
 Buildroot:      %{_tmppath}/%{name}-%{version}-root
-BuildRequires:	libxslt-devel, libxml2-devel
-BuildRequires:  qt-devel >= 3.0.0
+BuildRequires:  qt-devel >= 1:3.0.0
+BuildRequires:	libxslt-devel
 BuildRequires:  openssl-devel
 #BuildRequires:  net-snmp-devel
-Provides: 	%name = %version
 
 %description 
 Firewall Builder API library and compiler framework
 
 %files 
 %defattr(-,root,root)
-%doc doc/AUTHORS doc/COPYING doc/ChangeLog doc/Credits doc/INSTALL doc/README doc/PatchAcceptancePolicy.txt
+%doc doc/AUTHORS doc/COPYING doc/ChangeLog doc/Credits doc/README doc/PatchAcceptancePolicy.txt
 %dir %{_datadir}/libfwbuilder
 %{_datadir}/libfwbuilder/*
 %{_libdir}/*.so.*
@@ -30,7 +28,8 @@
 Summary:   Firewall Builder API Libraries and Header Files
 Group: 	   "Development/Libraries"
 Requires:  %{name} = %{version}-%{release}
-Provides:  %name-devel = %version-%release
+Requires: libxslt-devel
+Requires: openssl-devel
 
 %description devel
 This package contains the libraries  and header files that programmer would
@@ -39,8 +38,8 @@
 %files  devel
 %defattr(-, root, root)
 %{_bindir}/libfwbuilder-config-2
-/usr/include/fwb-2.0/fwbuilder
-/usr/include/fwb-2.0/fwcompiler
+%{_includedir}/fwb-2.0/fwbuilder
+%{_includedir}/fwb-2.0/fwcompiler
 
 
 %prep 
@@ -48,19 +47,21 @@
 
 
 %build
+[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
 ./configure --enable-auto-docdir --libdir=%{_libdir} --prefix=%{_prefix} --with-templatedir=%{_datadir}/libfwbuilder --disable-static  --enable-shared
-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
+[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
+rm -rf $RPM_BUILD_ROOT
+make DDIR=$RPM_BUILD_ROOT install
 # prevent including twice the doc
-rm -fr $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}
 
 
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 
 %post -p /sbin/ldconfig
@@ -69,6 +70,9 @@
 
 
 %changelog
+* Sat Jan 22 2005 Warren Togami <wtogami at redhat.com> 2.0.5-2
+- spec cleanup
+
 * Sat Jan 22 2005 Steve Grubb <sgrubb at redhat.com> 2.0.5
 - Created base spec file