rpms/kannel/devel kannel-1.4.0-depend.patch, NONE, 1.1 kannel.spec, 1.3, 1.4

Matthias Saou (thias) fedora-extras-commits at redhat.com
Mon Jan 17 12:11:48 UTC 2005


Author: thias

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

Modified Files:
	kannel.spec 
Added Files:
	kannel-1.4.0-depend.patch 
Log Message:
Fix for FC3's gcc, at last.


kannel-1.4.0-depend.patch:

--- NEW FILE kannel-1.4.0-depend.patch ---
#
# improve resistence against broken gcc -MM behaviour
# (observed with gcc 3.4.1)
# 2005-01-12 stefan.radman at ctbto.org
#
--- Makefile.in.orig	2004-08-24 21:50:09.000000000 +0000
+++ Makefile.in	2005-01-13 16:23:56.123117718 +0000
@@ -311,7 +311,7 @@
 
 depend .depend: wmlscript/wsgram.h gw-config.h
 	for dir in $(srcdirs); do \
-		$(MKDEPEND) $$dir/*.c | sed "s:^[^ ]:$$dir/&:"; done > .depend
+		$(MKDEPEND) $$dir/*.c | sed -e "s:^  *:\t:" -e "s:^[^\t#]:$$dir/&:" -e "s:^#.*::"; done > .depend
 include .depend
 
 libgw.a: $(gwobjs)


Index: kannel.spec
===================================================================
RCS file: /cvs/extras/rpms/kannel/devel/kannel.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kannel.spec	13 Jan 2005 18:06:30 -0000	1.3
+++ kannel.spec	17 Jan 2005 12:11:46 -0000	1.4
@@ -1,14 +1,16 @@
 Summary: WAP and SMS gateway
 Name: kannel
 Version: 1.4.0
-Release: 1
+Release: 3
 License: Kannel
 Group: System Environment/Daemons
 URL: http://www.kannel.org/
 Source: http://www.kannel.org/download/%{version}/gateway-%{version}.tar.bz2
+Patch: kannel-1.4.0-depend.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: bison, byacc, flex, ImageMagick
 BuildRequires: libxml2-devel, openssl-devel, zlib-devel
+BuildRequires: pcre-devel
 # DB backends
 BuildRequires: sqlite-devel
 # For the docs... I think we need transfig too, so disable for now.
@@ -42,6 +44,7 @@
 
 %prep
 %setup -n gateway-%{version}
+%patch -p0 -b .depend
 
 
 %build
@@ -93,8 +96,16 @@
 
 
 %changelog
+* Mon Jan 17 2005 Matthias Saou <http://freshrpms.net/> 1.4.0-3
+- Added Stefan Radman's patch for kannel bug #173 to fix .depend problem.
+
 * Fri Dec 10 2004 Matthias Saou <http://freshrpms.net/> 1.4.0-1
 - Update to 1.4.0.
+- Remove the obsolete OpenSSL workaround.
+
+* Thu Nov  4 2004 Matthias Saou <http://freshrpms.net/> 1.3.2-4
+- Added pcre support, doc building (almost) and sqlite backend...
+  it still fails with a corrupt first line of .depend on FC3, though.
 
 * Tue Aug 24 2004 Matthias Saou <http://freshrpms.net/> 1.3.2-2
 - Really comment out all scriplets, they're not yet used.




More information about the fedora-extras-commits mailing list