rpms/firebird/F-11 .cvsignore, 1.2, 1.3 firebird-fix-initscript.patch, 1.2, 1.3 firebird.spec, 1.5, 1.6 sources, 1.2, 1.3 firebird-2.1.2-doc.patch, 1.1, NONE
Philippe Makowski
makowski at fedoraproject.org
Thu Jul 30 12:49:12 UTC 2009
- Previous message (by thread): rpms/libhbalinux/devel .cvsignore, 1.2, 1.3 libhbalinux-1.0.7-conf.patch, 1.1, 1.2 libhbalinux.spec, 1.2, 1.3 sources, 1.2, 1.3
- Next message (by thread): rpms/gloox/F-10 .cvsignore, 1.2, 1.3 gloox.spec, 1.1, 1.2 sources, 1.2, 1.3 gloox-1.0-GCC4.4-missing_includes.patch, 1.1, NONE gloox-1.0-SVNr4003.glibc-private-symbol.patch, 1.1, NONE gloox-1.0-beta-SVNr4003-missed_header.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: makowski
Update of /cvs/pkgs/rpms/firebird/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22970
Modified Files:
.cvsignore firebird-fix-initscript.patch firebird.spec sources
Removed Files:
firebird-2.1.2-doc.patch
Log Message:
* Thu Jul 30 2009 Philippe Makowski <makowski at firebird-fr.eu.org> 2.1.3.18185.0-1
- Update to 2.1.3.18185
- Fix rh #514463
- Remove doc patch
- Apply backport initscript patch
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/firebird/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 4 May 2009 09:14:37 -0000 1.2
+++ .cvsignore 30 Jul 2009 12:49:11 -0000 1.3
@@ -1 +1 @@
-Firebird-2.1.2.18118-0.tar.bz2
+Firebird-2.1.3.18185-0.RC2.tar.bz2
firebird-fix-initscript.patch:
firebird.init.d.mandrake.in | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
Index: firebird-fix-initscript.patch
===================================================================
RCS file: /cvs/pkgs/rpms/firebird/F-11/firebird-fix-initscript.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- firebird-fix-initscript.patch 11 Jul 2009 16:11:42 -0000 1.2
+++ firebird-fix-initscript.patch 30 Jul 2009 12:49:11 -0000 1.3
@@ -1,52 +1,27 @@
---- builds/install/arch-specific/linux/misc/firebird.init.d.mandrake.in 2008-01-22 12:39:13.000000000 +0100
-+++ builds/install/arch-specific/linux/misc/firebird.init.d.mandrake.in.pm 2009-05-03 12:10:31.000000000 +0200
-@@ -19,6 +19,7 @@
- # Optionally run chkconfig to autostart the new service
- INSTANCE=default
- FIREBIRD=@prefix@
-+name=firebird
+--- builds/install/arch-specific/linux/misc/firebird.init.d.mandrake.in 2009-07-24 12:16:22.000000000 +0200
++++ builds/install/arch-specific/linux/misc/firebird.init.d.mandrake.in.new 2009-07-28 01:08:16.000000000 +0200
+@@ -1,11 +1,20 @@
+ #!/bin/sh
- # No changes needed below for multiple instances
- FBRunUser=firebird
-@@ -37,21 +37,25 @@
- case "$1" in
- start)
- echo -n "Starting $FULLNAME "
-- echo $MANAGER -pidfile $pidfile -start -forever | su $FBRunUser
-+ daemon --user=$FBRunUser $MANAGER -pidfile $pidfile -start -forever
- RETVAL=$?
-- [ $RETVAL -eq 0 ] && success || failure
-+ echo
-+ [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$name
- echo
- ;;
- stop)
-- echo -n "Stopping $FULLNAME "
--
- if [ -f $pidfile ]
- then
-- kill `cat $pidfile`
-+ echo -n "Stopping $FULLNAME: "
-+ killproc -p $pidfile $name
-+ RETVAL=$?
-+ echo
-+ else
-+ echo -n "$FULLNAME server is stopped"
-+ echo
- fi
- RETVAL=$?
-- [ $RETVAL -eq 0 ] && success || failure
-- echo
-+ [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$name
- ;;
- status)
- if [ -f $pidfile ]
-@@ -70,7 +75,7 @@
- RETVAL=$?
- ;;
- *)
-- echo "Usage: firebird {start|stop|status|restart|reload}"
-+ echo "Usage: $name {start|stop|status|restart|reload}"
- exit 1
- esac
+-# chkconfig: 345 20 80
++# chkconfig: 345 80 20
+ # description: Start/Stop firebird database server
+ #
+ # This file belongs in /etc/init.d where it will be run
+ # on system startup and shutdown to start the background
+ # Firebird database server daemon
++### BEGIN INIT INFO
++# Provides: firebird
++# Required-Start: $local_fs $syslog
++# Required-Stop:
++# Default-Start: 3 4 5
++# Default-Stop: 0 1 2 6
++# Short-Description: Firebird server database
++# Description: Starts and stops the Firebird database server backend daemon.
++### END INIT INFO
+ # Source function library - RedHat or Mandriva specific
+ # functions actually used: checkpid killproc daemon
+
+
+
Index: firebird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firebird/F-11/firebird.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- firebird.spec 11 Jul 2009 16:34:10 -0000 1.5
+++ firebird.spec 30 Jul 2009 12:49:11 -0000 1.6
@@ -1,24 +1,25 @@
-%global pkgname Firebird-2.1.2.18118-0
+%global pkgname Firebird-2.1.3.18185-0
%global fbroot %{_libdir}/%{name}
-%global major 2.1.2
+%global major 2.1.3
Summary: SQL relational database management system
Name: firebird
-Version: 2.1.2.18118.0
-Release: 11%{?dist}
+Version: 2.1.3.18185.0
+Release: 1%{?dist}
Group: Applications/Databases
License: Interbase
URL: http://www.firebirdsql.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
-Source0: http://downloads.sourceforge.net/firebird/%{pkgname}.tar.bz2
+#Source0: http://downloads.sourceforge.net/firebird/%{pkgname}.tar.bz2
+Source0: http://firebirdsql.org/downloads/prerelease/source/%{pkgname}.RC2.tar.bz2
Source1: firebird-logrotate
Source2: README.Fedora
Patch0: firebird-mcpu-to-mtune.patch
-Patch1: firebird-2.1.2-doc.patch
+#Patch1: firebird-2.1.2-doc.patch
Patch2: firebird-fix-initscript.patch
Patch3: firebird_lock-file-location.patch
Patch4: firebird-gcc-icu.patch
@@ -128,7 +129,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
%patch0
%patch3
%patch4
@@ -147,9 +148,14 @@ export CFLAGS='-m32'
export LDFLAGS='-m32'
%endif
+%ifarch ppc64
autoreconf -vfi
%configure --prefix=%{fbroot} \
--with-system-icu
+%else
+./autogen.sh --prefix=%{fbroot} \
+ --with-system-icu
+%endif
%ifarch sparc64
sed "s at COMMON_FLAGS=-m32 at COMMON_FLAGS=-m64@" -i ./gen/make.platform
@@ -172,10 +178,16 @@ chmod 644 ./buildroot-classic%{fbroot}/h
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
%ifarch sparc64
sed "s at COMMON_FLAGS=-m32 at COMMON_FLAGS=-m64@" -i ./gen/make.platform
@@ -243,19 +255,21 @@ cd %{buildroot}%{fbroot}/bin-superserver
ln -s fbmgr.bin fbmgr
cd %{buildroot}
+major2=`echo %{major} | sed 's|\.[0-9]*$||'`
+major1=`echo ${major2} | sed 's|\.[0-9]*$||'`
cd %{buildroot}%{fbroot}/lib/
-ln -s libfbembed.so.%{major} libfbembed.so.2.1
-ln -s libfbembed.so.2.1 libfbembed.so
-ln -s libfbclient.so.%{major} libfbclient.so.2
-ln -s libfbclient.so.2 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.2.1 libfbembed.so.2.1
+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.2 libfbclient.so.2
+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
@@ -292,7 +306,7 @@ ln -s %{_sysconfdir}/%{name}/fbintl.conf
sed "s@= root@= %{name}@" %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/misc/%{name}.xinetd > %{buildroot}%{_sysconfdir}/xinetd.d/%{name}
cp %{_builddir}/%{pkgname}/gen/buildroot-superserver%{fbroot}/misc/%{name}.init.d.mandrake %{buildroot}%{_initrddir}/%{name}
-sed "s at chkconfig: 345 at chkconfig: -@" -i %{buildroot}%{_initrddir}/%{name}
+#sed "s at chkconfig: 345 at chkconfig: -@" -i %{buildroot}%{_initrddir}/%{name}
sed "s@%%{fbroot}@%{fbroot}@g" %{SOURCE2} > %{_builddir}/%{pkgname}/doc/README.Fedora
ln -s %{_var}/run/%{name} .%{fbroot}/run
@@ -509,6 +523,12 @@ rm -Rf %{_var}/run/%{name}
%changelog
+* Thu Jul 30 2009 Philippe Makowski <makowski at firebird-fr.eu.org> 2.1.3.18185.0-1
+- Update to 2.1.3.18185
+- Fix rh #514463
+- Remove doc patch
+- Apply backport initscript patch
+
* Sat Jul 11 2009 Philippe Makowski <makowski at firebird-fr.eu.org> 2.1.2.18118.0-11
- change xinetd script (rh #506528)
- add missing library (and header files) for build php4-interbase module (rh #506728)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/firebird/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 4 May 2009 09:14:37 -0000 1.2
+++ sources 30 Jul 2009 12:49:11 -0000 1.3
@@ -1 +1 @@
-063b3825a06d328f726b733fd74614b1 Firebird-2.1.2.18118-0.tar.bz2
+a419db70057767b7d6b955436e6e7089 Firebird-2.1.3.18185-0.RC2.tar.bz2
--- firebird-2.1.2-doc.patch DELETED ---
- Previous message (by thread): rpms/libhbalinux/devel .cvsignore, 1.2, 1.3 libhbalinux-1.0.7-conf.patch, 1.1, 1.2 libhbalinux.spec, 1.2, 1.3 sources, 1.2, 1.3
- Next message (by thread): rpms/gloox/F-10 .cvsignore, 1.2, 1.3 gloox.spec, 1.1, 1.2 sources, 1.2, 1.3 gloox-1.0-GCC4.4-missing_includes.patch, 1.1, NONE gloox-1.0-SVNr4003.glibc-private-symbol.patch, 1.1, NONE gloox-1.0-beta-SVNr4003-missed_header.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list