add pkgconfig patch; add fb_config wrapper (from fedora)
authorElan Ruusamäe <glen@pld-linux.org>
Fri, 21 Jun 2019 10:31:08 +0000 (13:31 +0300)
committerElan Ruusamäe <glen@pld-linux.org>
Fri, 21 Jun 2019 10:31:53 +0000 (13:31 +0300)
Firebird.spec
add-pkgconfig-files.patch [new file with mode: 0644]
cloop-honour-build-flags.patch [new file with mode: 0644]
fb_config [new file with mode: 0644]

index 84aef7404d6b89e0c1886bd54e0af53a85f44847..08a4fd81ad2b66bdbb4b61ea800ff7ee6d9693df 100644 (file)
@@ -16,12 +16,12 @@ Summary(de.UTF-8):  Firebird - relationalen Open-Source- Datenbankmanagementsyste
 Summary(pl.UTF-8):     Firebird - serwer baz danych SQL oraz narzędzia klienckie
 Name:          Firebird
 Version:       3.0.4.33054
-Release:       1
+Release:       2
 License:       Interbase Public License 1.0, Initial Developer's Public License 1.0
 Group:         Applications/Databases
 Source0:       https://github.com/FirebirdSQL/firebird/releases/download/R3_0_4/%{name}-%{version}-0.tar.bz2
 # Source0-md5: 43569120299b2db7587dcfbddab1e25a
-Source1:       http://www.firebirdsql.org/file/documentation/reference_manuals/user_manuals/Firebird-3-QuickStart.pdf
+Source1:       http://www.firebirdsql.org/file/documentation/reference_manuals/user_manuals/%{name}-3-QuickStart.pdf
 # Source1-md5: 8e029d449e9cb3e1da8213ac6c11ad02
 # distfiles refuses this, would require some audit to allow '('/')' chars
 #Source2:      http://www.firebirdsql.org/pdfmanual/Using-Firebird_(wip).pdf
@@ -49,6 +49,7 @@ Source105:    firebird-classic.service
 Source106:     firebird-classic.socket
 Source107:     server_mode-ss.conf
 Source108:     server_mode-classic.conf
+Source109:     fb_config
 Patch0:                %{name}-chmod.patch
 Patch1:                %{name}-editline.patch
 Patch2:                %{name}-va.patch
@@ -56,11 +57,13 @@ Patch3:             %{name}-FHS.patch
 Patch4:                %{name}-opt.patch
 Patch5:                %{name}-gcc-icu.patch
 Patch6:                %{name}-libpath.patch
+Patch7:                add-pkgconfig-files.patch
 Patch8:                Provide-sized-global-delete-operators-when-compiled.patch
 Patch9:                parallel-build.patch
 Patch10:       no-copy-from-icu.patch
 Patch11:       config.patch
 Patch12:       chown.patch
+Patch13:       cloop-honour-build-flags.patch
 URL:           http://www.firebirdsql.org/
 BuildRequires: autoconf >= 2.67
 BuildRequires: automake
@@ -194,11 +197,13 @@ Skrypty startowe Firebirda w wersji Classic (inetd).
 %patch4 -p1
 %patch5 -p0
 %patch6 -p1
+%patch7 -p1
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
 
 mkdir docs
 cp %{SOURCE1} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} %{SOURCE9} docs
@@ -279,6 +284,7 @@ cp -p %{SOURCE106} $RPM_BUILD_ROOT%{systemdunitdir}/firebird-classic.socket
 
 cp -p %{SOURCE107} $RPM_BUILD_ROOT%{_sysconfdir}/firebird/conf.d/
 cp -p %{SOURCE108} $RPM_BUILD_ROOT%{_sysconfdir}/firebird/conf.d/
+install -p %{_sourcedir}/fb_config $RPM_BUILD_ROOT%{_bindir}/fb_config
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -395,6 +401,7 @@ fi
 
 %files devel
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/fb_config
 %attr(755,root,root) %{_libdir}/libfbclient.so
 %attr(755,root,root) %{ibdir}/bin/fb_config
 %attr(755,root,root) %{ibdir}/bin/gpre
diff --git a/add-pkgconfig-files.patch b/add-pkgconfig-files.patch
new file mode 100644 (file)
index 0000000..d8ea48c
--- /dev/null
@@ -0,0 +1,42 @@
+From: Michal Kubecek <mkubecek@suse.cz>
+Date: Tue, 12 Jun 2012 14:32:44 +0200
+Subject: add pkgconfig files
+
+---
+ builds/install/arch-specific/linux/misc/fbclient.pc.in | 10 ++++++++++
+ configure.ac                                           |  1 +
+ 2 files changed, 11 insertions(+)
+ create mode 100644 builds/install/arch-specific/linux/misc/fbclient.pc.in
+
+diff --git a/builds/install/arch-specific/linux/misc/fbclient.pc.in b/builds/install/arch-specific/linux/misc/fbclient.pc.in
+new file mode 100644
+index 000000000000..d49fdc5821c5
+--- /dev/null
++++ b/builds/install/arch-specific/linux/misc/fbclient.pc.in
+@@ -0,0 +1,10 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@FB_LIBDIR@
++includedir=@FB_INCDIR@
++
++Name: fbclient
++Description: Firebird client library
++Version: @FIREBIRD_VERSION@
++Cflags: -I${includedir}/firebird
++Libs: -L${libdir} -lfbclient
+diff --git a/configure.ac b/configure.ac
+index 717f5eccc53d..60b3aaa5b08b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1200,6 +1200,7 @@ case "$PLATFORM" in
+         gen/install/misc/firebird.init.d.gentoo:builds/install/arch-specific/linux/firebird.init.d.gentoo.in
+         gen/install/misc/firebird.init.d.slackware:builds/install/arch-specific/linux/firebird.init.d.slackware.in
+         gen/install/misc/rc.config.firebird:builds/install/arch-specific/linux/rc.config.firebird.in
++        gen/install/misc/fbclient.pc:builds/install/arch-specific/linux/misc/fbclient.pc.in
+         gen/Release/firebird/bin/linuxLibrary.sh:builds/install/arch-specific/linux/linuxLibrary.sh.in
+         gen/install/misc/firebird-classic@.service:builds/install/arch-specific/linux/firebird-classic.service.in
+         gen/install/misc/firebird-classic.socket:builds/install/arch-specific/linux/firebird-classic.socket.in
+-- 
+2.3.4
+
+
diff --git a/cloop-honour-build-flags.patch b/cloop-honour-build-flags.patch
new file mode 100644 (file)
index 0000000..1f556e0
--- /dev/null
@@ -0,0 +1,27 @@
+Description: make cloop build honor compiler/linker flags from the environment
+Author: Damyan Ivanov <dmn@debian.org>
+Forwarded: no
+
+--- a/extern/cloop/Makefile
++++ b/extern/cloop/Makefile
+@@ -6,7 +6,7 @@ TARGET := release
+ CC    := gcc
+ CXX   := g++
+-LD    := $(CXX)
++LD    := $(CXX) $(LDFLAGS)
+ SRC_DIR               := src
+ BUILD_DIR     := build
+@@ -27,8 +27,9 @@ SRCS_CPP := $(foreach sdir,$(SRC_DIRS),$
+ OBJS_C := $(patsubst $(SRC_DIR)/%.c,$(OBJ_DIR)/%.o,$(SRCS_C))
+ OBJS_CPP := $(patsubst $(SRC_DIR)/%.cpp,$(OBJ_DIR)/%.o,$(SRCS_CPP))
+-C_FLAGS := -ggdb -fPIC -MMD -MP -W -Wall -Wno-unused-parameter
+-CXX_FLAGS := $(C_FLAGS)
++COMMON_C_FLAGS := -ggdb -fPIC -MMD -MP -W -Wall -Wno-unused-parameter
++C_FLAGS := $(COMMON_C_FLAGS) $(CFLAGS) $(CPPFLAGS)
++CXX_FLAGS := $(COMMON_C_FLAGS) $(CXXFLAGS) $(CPPFLAGS)
+ FPC_FLAGS := -Mdelphi
+ ifeq ($(TARGET),release)
diff --git a/fb_config b/fb_config
new file mode 100644 (file)
index 0000000..039843e
--- /dev/null
+++ b/fb_config
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+set -e
+ARCH=$(uname -m)
+
+case "$ARCH" in
+    x86_64 | sparc64 | s390x | ppc64 | aarch64)
+        LIB_DIR=/usr/lib64
+        SECONDARY_LIB_DIR=/usr/lib
+        ;;
+    *)
+        LIB_DIR=/usr/lib
+        SECONDARY_LIB_DIR=/usr/lib64
+        ;;
+esac
+
+if [ ! -x "$LIB_DIR"/fb_config ]; then
+    LIB_DIR=$SECONDARY_LIB_DIR
+fi
+
+exec "$LIB_DIR"/fb_config "$@"
This page took 0.490251 seconds and 4 git commands to generate.