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

[Stjepan Gros]

Author: sgros

Update of /cvs/pkgs/rpms/Vuurmuur/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4000/devel

Modified Files:
	Vuurmuur.spec 
Log Message:
- Removed parallel make that was erratically breaking the build process



Index: Vuurmuur.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Vuurmuur/devel/Vuurmuur.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- Vuurmuur.spec	22 Nov 2009 22:03:43 -0000	1.1
+++ Vuurmuur.spec	23 Nov 2009 16:01:33 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		Vuurmuur
 Version:	0.7
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Firewall manager built on top of iptables
 Group:		System Environment/Libraries
 License:	GPLv2+
@@ -80,8 +80,7 @@ LIBVUDIR=$(pwd)
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
-# Parallel make is not used because compilation stops with an error
-make
+make %{?_smp_mflags}
 
 cd ../vuurmuur-%{version}
 %configure \
@@ -117,7 +116,9 @@ cd ../vuurmuur_conf-%{version}
 # Configure ignores --disable-rpath so we have to solve it this way
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-make %{?_smp_mflags}
+
+# Parallel build is not supported for this component so it's disabled
+make
 
 # Convert MAN pages to UTF-8
 pushd man/ru
@@ -267,6 +268,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/vuurmuur
 
 %changelog
+* Mon Nov 23 2009 Stjepan Gros <stjepan.gros at gmail.com> - 0.7-7
+- Parallel make enabled for libvuurmuur and disabled for vuurmuur_conf
+
 * Thu Nov 19 2009 Stjepan Gros <stjepan.gros at gmail.com> - 0.7-6
 - Fixed macros in changelog