Hello community,
here is the log from the commit of package rubygem-pg for openSUSE:Factory checked in at 2019-04-17 10:10:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rubygem-pg (Old)
and /work/SRC/openSUSE:Factory/.rubygem-pg.new.17052 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-pg"
Wed Apr 17 10:10:40 2019 rev:37 rq:694892 version:1.1.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/rubygem-pg/rubygem-pg.changes 2019-03-04 09:20:52.884595516 +0100
+++ /work/SRC/openSUSE:Factory/.rubygem-pg.new.17052/rubygem-pg.changes 2019-04-17 10:11:27.062983305 +0200
@@ -1,0 +2,5 @@
+Wed Apr 10 20:25:16 UTC 2019 - Christophe Giboudeaux
+
+- Add use-pkg-config.patch to avoid relying on postgresql-server.
+
+-------------------------------------------------------------------
New:
----
use-pkg-config.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rubygem-pg.spec ++++++
--- /var/tmp/diff_new_pack.zLGQ3s/_old 2019-04-17 10:11:29.782986203 +0200
+++ /var/tmp/diff_new_pack.zLGQ3s/_new 2019-04-17 10:11:29.786986207 +0200
@@ -41,6 +41,9 @@
Source: https://rubygems.org/gems/%{mod_full_name}.gem
Source1: rubygem-pg-rpmlintrc
Source2: gem2rpm.yml
+# MANUAL
+Patch0: use-pkg-config.patch
+# /MANUAL
Summary: Pg is the Ruby interface to the PostgreSQL RDBMS
License: BSD-3-Clause
Group: Development/Languages/Ruby
@@ -64,6 +67,10 @@
end.
%prep
+%gem_unpack
+%patch0 -p1
+find -type f -print0 | xargs -0 touch -r %{S:0}
+%gem_build
%build
++++++ gem2rpm.yml ++++++
--- /var/tmp/diff_new_pack.zLGQ3s/_old 2019-04-17 10:11:29.806986229 +0200
+++ /var/tmp/diff_new_pack.zLGQ3s/_new 2019-04-17 10:11:29.806986229 +0200
@@ -6,3 +6,6 @@
:preamble: |-
BuildRequires: openssl-devel
BuildRequires: postgresql-devel
+
+:patches:
+ use-pkg-config.patch: -p1
++++++ use-pkg-config.patch ++++++
Index: pg-1.1.4/ext/extconf.rb
===================================================================
--- pg-1.1.4.orig/ext/extconf.rb
+++ pg-1.1.4/ext/extconf.rb
@@ -23,27 +23,29 @@ if enable_config("windows-cross")
else
# Native build
+ pg_package = pkg_config('libpq')
+ if !pg_package
+ pgconfig = with_config('pg-config') ||
+ with_config('pg_config') ||
+ find_executable('pg_config')
- pgconfig = with_config('pg-config') ||
- with_config('pg_config') ||
- find_executable('pg_config')
+ if pgconfig && pgconfig != 'ignore'
+ $stderr.puts "Using config values from %s" % [ pgconfig ]
+ incdir = `"#{pgconfig}" --includedir`.chomp
+ libdir = `"#{pgconfig}" --libdir`.chomp
+ dir_config 'pg', incdir, libdir
- if pgconfig && pgconfig != 'ignore'
- $stderr.puts "Using config values from %s" % [ pgconfig ]
- incdir = `"#{pgconfig}" --includedir`.chomp
- libdir = `"#{pgconfig}" --libdir`.chomp
- dir_config 'pg', incdir, libdir
-
- # Try to use runtime path linker option, even if RbConfig doesn't know about it.
- # The rpath option is usually set implicit by dir_config(), but so far not
- # on MacOS-X.
- if RbConfig::CONFIG["RPATHFLAG"].to_s.empty? && try_link('int main() {return 0;}', " -Wl,-rpath,#{libdir}")
- $LDFLAGS << " -Wl,-rpath,#{libdir}"
+ # Try to use runtime path linker option, even if RbConfig doesn't know about it.
+ # The rpath option is usually set implicit by dir_config(), but so far not
+ # on MacOS-X.
+ if RbConfig::CONFIG["RPATHFLAG"].to_s.empty? && try_link('int main() {return 0;}', " -Wl,-rpath,#{libdir}")
+ $LDFLAGS << " -Wl,-rpath,#{libdir}"
+ end
+ else
+ $stderr.puts "No pg_config... trying anyway. If building fails, please try again with",
+ " --with-pg-config=/path/to/pg_config"
+ dir_config 'pg'
end
- else
- $stderr.puts "No pg_config... trying anyway. If building fails, please try again with",
- " --with-pg-config=/path/to/pg_config"
- dir_config 'pg'
end
end