commit 4629c2dc2664867afc8c15d69ffc704f07650dc7
Author: Jakub Bogusz <[email protected]>
Date: Fri Aug 30 15:55:24 2019 +0200
- updated to 10.17.11
- removed obsolete soname patch
libgdata-soname.patch | 31 -------------------------------
libgdata.spec | 23 +++++++++++++++--------
2 files changed, 15 insertions(+), 39 deletions(-)
---
diff --git a/libgdata.spec b/libgdata.spec
index a604682..d2f6f26 100644
--- a/libgdata.spec
+++ b/libgdata.spec
@@ -1,13 +1,16 @@
+#
+# Conditional build:
+%bcond_without static_libs # static library
+
Summary: GData access library
Summary(pl.UTF-8): Biblioteka dostępu poprzez protokół GData
Name: libgdata
-Version: 0.17.10
+Version: 0.17.11
Release: 1
License: LGPL v2.1+
Group: Libraries
Source0:
http://ftp.gnome.org/pub/GNOME/sources/libgdata/0.17/%{name}-%{version}.tar.xz
-# Source0-md5: d858d411ad394c275643b14993dfeed4
-Patch0: %{name}-soname.patch
+# Source0-md5: 7b98e9059255d8a2fb147c4e727230a8
URL: https://wiki.gnome.org/Projects/libgdata
BuildRequires: gcr-devel >= 3
# for tests only
@@ -26,6 +29,7 @@ BuildRequires: meson >= 0.50.0
BuildRequires: ninja >= 1.5
BuildRequires: pkgconfig
BuildRequires: rpmbuild(macros) >= 1.736
+BuildRequires: sed >= 4.0
BuildRequires: tar >= 1:1.22
BuildRequires: uhttpmock-devel >= 0.5.0
BuildRequires: vala
@@ -116,7 +120,10 @@ API libgdata dla języka Vala.
%prep
%setup -q
-%patch0 -p1
+
+%if %{with static_libs}
+%{__sed} -i -e '/^libgdata_lib =/ s/shared_library/library/' gdata/meson.build
+%endif
%build
%meson build \
@@ -130,15 +137,15 @@ rm -rf $RPM_BUILD_ROOT
%ninja_install -C build
-%find_lang %{name}
+%find_lang gdata
%clean
rm -rf $RPM_BUILD_ROOT
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
-%files -f %{name}.lang
+%files -f gdata.lang
%defattr(644,root,root,755)
%doc AUTHORS NEWS README
%attr(755,root,root) %{_libdir}/libgdata.so.*.*.*
diff --git a/libgdata-soname.patch b/libgdata-soname.patch
deleted file mode 100644
index 68d0716..0000000
--- a/libgdata-soname.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- libgdata-0.17.10/meson.build.orig 2019-06-25 14:09:09.000000000 +0200
-+++ libgdata-0.17.10/meson.build 2019-06-26 18:51:01.522940933 +0200
-@@ -37,7 +37,8 @@
- current = 26
- revision = 0
- age = 4
--gdata_soversion = '@0@.@1@.@2@'.format(current - age, age, revision)
-+gdata_libversion = '@0@.@1@.@2@'.format(current - age, age, revision)
-+gdata_soversion = '@0@'.format(current - age)
-
- top_inc_dir = include_directories('.')
-
---- libgdata-0.17.10/gdata/meson.build.orig 2019-06-25 14:09:09.000000000
+0200
-+++ libgdata-0.17.10/gdata/meson.build 2019-06-26 18:51:00.606279233 +0200
-@@ -134,7 +134,7 @@
- symbol_map = meson.current_source_dir() / 'symbol.map'
- ldflags = cc.get_supported_link_arguments('-Wl,--version-script,' +
symbol_map)
-
--libgdata_lib = shared_library(
-+libgdata_lib = library(
- 'gdata',
- include_directories: incs,
- sources: sources + enum_headers + marshal_files,
-@@ -142,6 +142,7 @@
- link_args: ldflags,
- link_depends: symbol_map,
- install: true,
-+ version: gdata_libversion,
- soversion: gdata_soversion,
- gnu_symbol_visibility: 'default',
- )
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libgdata.git/commitdiff/4629c2dc2664867afc8c15d69ffc704f07650dc7
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
