rpms/Falcon/devel Falcon.spec, 1.6, 1.7 Falcon-core-0810-r401.patch, 1.1, NONE

[Michel Alexandre Salim (salimma)]

Author: salimma

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

Modified Files:
	Falcon.spec 
Removed Files:
	Falcon-core-0810-r401.patch 
Log Message:
Falcon-0.8.10-3: revert to earlier workaround for cmake-2.6



Index: Falcon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Falcon/devel/Falcon.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Falcon.spec	9 Jun 2008 22:09:50 -0000	1.6
+++ Falcon.spec	9 Jun 2008 22:37:04 -0000	1.7
@@ -2,15 +2,14 @@
 
 Name:            Falcon
 Version:         0.8.10
-Release:         2%{?dist}
+Release:         3%{?dist}
 Summary:         The Falcon Programming Language
 Summary(it):     Il linguaggio di programmazione Falcon
 License:        GPLv2+
 Group:          Development/Languages
 URL:            http://%{host}/
 Source:         http://%{host}/project_dl/_official_rel/%{name}-%{version}.tar.gz
-Patch0:         Falcon-core-0810-r401.patch
-Patch1:         Falcon-0.8.10-prefix.patch
+Patch0:         Falcon-0.8.10-prefix.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:  bison cmake pcre-devel zlib-devel
 
@@ -50,8 +49,7 @@
 
 %prep
 %setup -q
-(cd core && %patch0 -p0 -b .r401)
-%patch1 -p1 -b .prefix
+%patch0 -p1 -b .prefix
 
 
 %build
@@ -62,6 +60,11 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 ./build.sh -i
+# with cmake-2.6, the default install target misses some files
+[ -f $RPM_BUILD_ROOT%{_bindir}/faltest ] || \
+  (cd devel/release/build/core && make install && \
+   cd ../modules/feathers && make install)
+# Fix falconeer script
 sed -i "s|#!/bin/falcon|#!%{_bindir}/falcon|" \
   $RPM_BUILD_ROOT%{_bindir}/falconeer.fal
 
@@ -100,6 +103,10 @@
 %{_mandir}/man1/faltest*
 
 %changelog
+* Mon Jun  9 2008 Michel Alexandre Salim <salimma at fedoraproject.org> - 0.8.10-3
+- Revert r401 patch; does not fix cmake-2.6 problem on Rawhide
+  Reverting to manually using 'make install' in individual subdirectories
+
 * Mon Jun  9 2008 Michel Alexandre Salim <salimma at fedoraproject.org> - 0.8.10-2
 - Merge in cmake fixes from core/trunk r401
 - Patch core/CMakeLists.txt to default to /usr, as it appears that the


--- Falcon-core-0810-r401.patch DELETED ---