rpms/kdesdk/F-7 kdesdk-3.5.7-flex.patch, NONE, 1.1 kdesdk.spec, 1.67, 1.68

[Than Ngo (than)]

Author: than

Update of /cvs/extras/rpms/kdesdk/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19303

Modified Files:
	kdesdk.spec 
Added Files:
	kdesdk-3.5.7-flex.patch 
Log Message:
3.5.7


kdesdk-3.5.7-flex.patch:

--- NEW FILE kdesdk-3.5.7-flex.patch ---
--- kdesdk-3.5.7/kbabel/common/libgettext/Makefile.am.orig	2007-06-17 21:01:01.000000000 +0200
+++ kdesdk-3.5.7/kbabel/common/libgettext/Makefile.am	2007-06-17 21:02:17.000000000 +0200
@@ -11,5 +11,6 @@ libgettext_la_SOURCES = pofiles.cc
 
 pofiles.cc: $(srcdir)/pofiles.ll
 	$(LEX) -+ -opofiles.cc $(srcdir)/pofiles.ll
+	$(PERL) -pi -e "s,^#define yy*.* Gettext*.*,," $(srcdir)/pofiles.cc
 
 noinst_HEADERS = tokens.h pofiles.h


Index: kdesdk.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesdk/F-7/kdesdk.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- kdesdk.spec	17 Jun 2007 18:06:34 -0000	1.67
+++ kdesdk.spec	17 Jun 2007 19:07:58 -0000	1.68
@@ -24,6 +24,8 @@
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Patch1: kdesdk-3.4.0-db4.patch
 Patch2: kdesdk-3.5.4-multilib.patch
+# flex workaround 
+Patch3: kdesdk-3.5.7-flex.patch
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -38,6 +40,8 @@
 BuildRequires: binutils-devel
 BuildRequires: perl
 BuildRequires: subversion-devel
+BuildRequires: apr-util-devel
+BuildRequires: apr-devel
 
 %description
 A collection of applications and tools used by KDE developers.
@@ -60,6 +64,7 @@
 
 %patch1 -p1 -b .db4
 %patch2 -p1 -b .multilib
+%patch3 -p1 -b .flex-workaround
 
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
@@ -85,10 +90,6 @@
 %endif
    --includedir=%{_includedir}/kde
 
-# flex workaround
-make -C kbabel/common/libgettext || :
-perl -pi -e "s,^#define yy*.* Gettext*.*,," kbabel/common/libgettext/pofiles.cc
-
 make %{?_smp_mflags}