rpms/firebird/devel firebird-edit-fix.patch, NONE, 1.1 firebird.spec, 1.8, 1.9

Philippe Makowski makowski at fedoraproject.org
Mon Aug 10 22:44:03 UTC 2009 

Author: makowski

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

Modified Files:
	firebird.spec 
Added Files:
	firebird-edit-fix.patch 
Log Message:
* Mon Aug 11 2009  Philippe Makowski <makowski at fedoraproject.org> 2.1.3.18185.0-4
- build it against system edit lib
- set correct setuid for Classic lock manager
- set correct permission for /var/run/firebird


firebird-edit-fix.patch:
 builds/posix/make.defaults |    2 +-
 configure.in               |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE firebird-edit-fix.patch ---
diff -Naur Firebird-2.1.1.17910-0/builds/posix/make.defaults Firebird-2.1.1.17910-0.oden/builds/posix/make.defaults
--- Firebird-2.1.1.17910-0/builds/posix/make.defaults	2008-05-27 05:26:39.000000000 -0400
+++ Firebird-2.1.1.17910-0.oden/builds/posix/make.defaults	2008-07-18 09:54:40.000000000 -0400
@@ -230,7 +230,7 @@
 
 ifeq ($(EDITLINE_FLG),Y)
   ifeq ($(STD_EDITLINE), true)
-	LIBEDITLINE := -leditline
+	LIBEDITLINE := -ledit
   else
 	LIBEDITLINE := $(LIB)/libeditline.a
   endif
diff -Naur Firebird-2.1.1.17910-0/configure.in Firebird-2.1.1.17910-0.oden/configure.in
--- Firebird-2.1.1.17910-0/configure.in	2008-05-27 05:26:28.000000000 -0400
+++ Firebird-2.1.1.17910-0.oden/configure.in	2008-07-18 09:54:25.000000000 -0400
@@ -399,7 +399,7 @@
 # not need editline in default libs, but need to test for its presence
 saveLIBS=$LIBS
 if test "$STD_EDITLINE" = "true"; then
-  AC_CHECK_LIB(editline, readline, EDITLINE_FLG=Y, STD_EDITLINE=false)
+  AC_CHECK_LIB(edit, readline, EDITLINE_FLG=Y, STD_EDITLINE=false)
 fi
 LIBS=$saveLIBS



Index: firebird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firebird/devel/firebird.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- firebird.spec	8 Aug 2009 17:29:18 -0000	1.8
+++ firebird.spec	10 Aug 2009 22:44:03 -0000	1.9
@@ -6,7 +6,7 @@
 Summary:	SQL relational database management system
 Name:		firebird
 Version:	2.1.3.18185.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 
 Group:		Applications/Databases
 License:	Interbase
@@ -19,7 +19,7 @@ Source1:	firebird-logrotate
 Source2:	README.Fedora
 
 Patch0:		firebird-mcpu-to-mtune.patch
-#Patch1:		firebird-2.1.2-doc.patch
+Patch1:		firebird-edit-fix.patch
 Patch2:		firebird-fix-initscript.patch
 Patch3:		firebird_lock-file-location.patch
 Patch4:		firebird-gcc-icu.patch
@@ -32,6 +32,7 @@ BuildRequires:	libtool
 BuildRequires:	ncurses-devel
 BuildRequires:	libtermcap-devel
 BuildRequires:	libicu-devel
+BuildRequires:	libedit-devel
 BuildRequires:	gcc-c++
 
 Requires:	%{name}-arch = %{version}-%{release}
@@ -129,7 +130,7 @@ Multi-process, local client libraries fo
 iconv	-f	ISO-8859-1	-t	utf-8	-c	./doc/README.intl					-o	./doc/README.intl
 # backport patch
 %patch2
-#%patch1
+%patch1 -p1
 %patch0
 %patch3
 %patch4
@@ -150,13 +151,9 @@ export LDFLAGS='-m32'
 
 %ifarch	ppc64
 autoreconf -vfi
-%configure --prefix=%{fbroot}	\
-		--with-system-icu	
-%else
-./autogen.sh	--prefix=%{fbroot}	\
-		--with-system-icu		
 %endif
-
+NOCONFIGURE=1 ./autogen.sh
+%configure --prefix=%{fbroot} --with-system-icu --with-system-editline
 %ifarch	sparc64 
 sed	"s at COMMON_FLAGS=-m32 at COMMON_FLAGS=-m64@"	-i	./gen/make.platform	
 %endif
@@ -180,14 +177,8 @@ cd ..
 # superserver
 %ifarch	ppc64
 autoreconf -vfi
-%configure --prefix=%{fbroot}	\
-		--enable-superserver	\
-		--with-system-icu	
-%else
-./autogen.sh	--prefix=%{fbroot}	\
-		--enable-superserver	\
-		--with-system-icu	
 %endif
+%configure --prefix=%{fbroot} --with-system-icu --with-system-editline --enable-superserver
 		
 %ifarch	sparc64 
 sed	"s at COMMON_FLAGS=-m32 at COMMON_FLAGS=-m64@"	-i	./gen/make.platform	
@@ -258,18 +249,18 @@ cd	%{buildroot}
 major2=`echo %{major} | sed 's|\.[0-9]*$||'`
 major1=`echo ${major2} | sed 's|\.[0-9]*$||'` 
 cd	%{buildroot}%{fbroot}/lib/
-ln	-s	%{fbroot}/lib/libfbembed.so.%{major}	libfbembed.so.%{major2} 
-ln	-s	%{fbroot}/lib/libfbembed.so.%{major2} 	libfbembed.so
-ln	-s	%{fbroot}/lib/libfbclient.so.%{major}	libfbclient.so.%{major1} 
-ln	-s	%{fbroot}/lib/libfbclient.so.%{major1}	libfbclient.so
+ln	-s	%{fbroot}/lib/libfbembed.so.%{major}	libfbembed.so.${major2} 
+ln	-s	%{fbroot}/lib/libfbembed.so.${major2} 	libfbembed.so
+ln	-s	%{fbroot}/lib/libfbclient.so.%{major}	libfbclient.so.${major1} 
+ln	-s	%{fbroot}/lib/libfbclient.so.${major1}	libfbclient.so
 cd	%{buildroot}
 
 cd	%{buildroot}%{_libdir}
 ln	-s	%{fbroot}/lib/libfbembed.so	libfbembed.so
-ln	-s	%{fbroot}/lib/libfbembed.so.%{major2}	libfbembed.so.%{major2}
+ln	-s	%{fbroot}/lib/libfbembed.so.${major2}	libfbembed.so.${major2}
 ln	-s	%{fbroot}/lib/libfbembed.so.%{major}	libfbembed.so.%{major}
 ln	-s	%{fbroot}/lib/libfbclient.so	libfbclient.so
-ln	-s	%{fbroot}/lib/libfbclient.so.%{major1}	libfbclient.so.%{major1}
+ln	-s	%{fbroot}/lib/libfbclient.so.${major1}	libfbclient.so.${major1}
 ln	-s	%{fbroot}/lib/libfbclient.so.%{major}	libfbclient.so.%{major}
 ln	-s	%{fbroot}/lib/libfbclient.so.%{major}	libgds.so.0
 ln	-s	%{fbroot}/lib/libfbclient.so	libgds.so
@@ -444,7 +435,7 @@ fi
 %{_bindir}/gfix
 %{_bindir}/nbackup
 %{_bindir}/gstat-fb
-%dir %attr(0755,%{name},%{name}) %{_var}/run/%{name}
+%dir %attr(0775,%{name},%{name}) %{_var}/run/%{name}
 %defattr(0755,root,root,0755)
 %{fbroot}/run
 
@@ -500,7 +491,6 @@ fi
 %dir %{fbroot}/bin-classic
 %dir %{fbroot}/UDF-classic
 %defattr(0755,root,root,0755)
-%{fbroot}/bin-classic/*
 %{fbroot}/bin-classic/changeDBAPassword.sh
 %{fbroot}/bin-classic/changeGdsLibraryCompatibleLink.sh
 %{fbroot}/bin-classic/changeRunUser.sh
@@ -543,8 +533,10 @@ fi
 
 
 %changelog
-* Sat Aug 08 2009  Philippe Makowski <makowski at fedoraproject.org> 2.1.3.18185.0-3
+* Mon Aug 11 2009  Philippe Makowski <makowski at fedoraproject.org> 2.1.3.18185.0-4
+- build it against system edit lib
 - set correct setuid for Classic lock manager
+- set correct permission for /var/run/firebird
 
 * Wed Aug 05 2009  Philippe Makowski <makowski at firebird-fr.eu.org> 2.1.3.18185.0-2
 - rename /usr/bin/gstat to /usr/bin/gstat-fb  to avoid conflict with ganglia-gmond (rh #515510)

More information about the scm-commits mailing list