rpms/gnokii/devel gnokii.spec, 1.26, 1.27 gnokii-pkgconfig.patch, 1.3, NONE gnokii-xgnokii-pkgconfig.patch, 1.3, NONE

Bastien Nocera (hadess) fedora-extras-commits at redhat.com
Mon May 19 12:36:17 UTC 2008


Author: hadess

Update of /cvs/pkgs/rpms/gnokii/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27736

Modified Files:
	gnokii.spec 
Removed Files:
	gnokii-pkgconfig.patch gnokii-xgnokii-pkgconfig.patch 
Log Message:
Fix build



Index: gnokii.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnokii/devel/gnokii.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- gnokii.spec	19 May 2008 12:19:22 -0000	1.26
+++ gnokii.spec	19 May 2008 12:35:08 -0000	1.27
@@ -19,9 +19,6 @@
 # Patch to remove port locking and apply the system-wide /usr/sbin directory
 # to the path instead of the default /usr/local
 Patch1:         %{name}-config.patch
-# Patch to fix the superfluous include statements
-Patch3:         %{name}-pkgconfig.patch
-Patch4:		%{name}-xgnokii-pkgconfig.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  flex
@@ -99,25 +96,13 @@
 %setup -q
 %patch0 -p0
 %patch1 -p0
-%patch3 -p0
-%patch4 -p0
 install -pm 644 %{SOURCE5} smsd2mail.sh
 install -pm 644 %{SOURCE6} README.smsd2mail
-# Polish default font, cool but ISO8859-2
-iconv -f iso8859-2 -t utf8 -o iconv.tmp Docs/CREDITS
-mv iconv.tmp Docs/CREDITS
-iconv -f iso8859-2 -t utf8 -o iconv.tmp COPYRIGHT
-mv iconv.tmp COPYRIGHT
-iconv -f iso8859-2 -t utf8 -o iconv.tmp smsd/ChangeLog
-mv iconv.tmp smsd/ChangeLog
-iconv -f iso8859-2 -t utf8 -o iconv.tmp xgnokii/ChangeLog
-mv iconv.tmp xgnokii/ChangeLog
-
 
 %build
 %configure --enable-security --disable-rpath --disable-static \
   %{?_with_libical:--with-libical=%{_prefix}}
-make # -j X for X > 1 fails as of 0.5.6 - 0.6.7
+make %{?_smp_mflags}
 
 
 %install


--- gnokii-pkgconfig.patch DELETED ---


--- gnokii-xgnokii-pkgconfig.patch DELETED ---




More information about the fedora-extras-commits mailing list