From f4d656841c360b567b17aa0c006cd51fd636d4e7b281487bfe1c8758f7a4e608 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Tue, 10 Mar 2015 10:48:35 +0000 Subject: [PATCH 1/3] Accepting request 290124 from home:pgajdos - no build date [bnc#916338] + libquvi-fake-build-date.patch OBS-URL: https://build.opensuse.org/request/show/290124 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libquvi?expand=0&rev=16 --- libquvi-fake-build-date.patch | 13 +++++++++++++ libquvi.changes | 6 ++++++ libquvi.spec | 5 ++++- 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 libquvi-fake-build-date.patch diff --git a/libquvi-fake-build-date.patch b/libquvi-fake-build-date.patch new file mode 100644 index 0000000..d5a6aec --- /dev/null +++ b/libquvi-fake-build-date.patch @@ -0,0 +1,13 @@ +Index: configure +=================================================================== +--- configure.orig 2013-11-10 08:45:43.000000000 +0100 ++++ configure 2015-03-10 11:26:07.118800252 +0100 +@@ -14716,7 +14716,7 @@ + + + if test x"$DATE" != "xno"; then : +- build_time=`$DATE +"%F %T %z"` ++ build_time="0000-00-00 00:00:00 +0000" + fi + + cat >>confdefs.h <<_ACEOF diff --git a/libquvi.changes b/libquvi.changes index c6fdeb0..7976ffc 100644 --- a/libquvi.changes +++ b/libquvi.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Mar 10 10:30:51 UTC 2015 - pgajdos@suse.com + +- no build date [bnc#916338] + + libquvi-fake-build-date.patch + ------------------------------------------------------------------- Mon Feb 10 19:32:50 UTC 2014 - dimstar@opensuse.org diff --git a/libquvi.spec b/libquvi.spec index cb75923..88f7557 100644 --- a/libquvi.spec +++ b/libquvi.spec @@ -1,7 +1,7 @@ # # spec file for package libquvi # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,6 +26,8 @@ License: LGPL-2.1+ Group: System/Libraries Url: http://quvi.sourceforge.net/ Source: http://sourceforge.net/projects/quvi/files/0.9/libquvi/libquvi-0.9.4.tar.xz +# suse specific +Patch0: %{name}-fake-build-date.patch BuildRequires: lua-devel # For pkgconfig() Provides BuildRequires: libgcrypt-devel @@ -60,6 +62,7 @@ URLs with C API. %prep %setup -q +%patch0 %build export CFLAGS="%{optflags} -DLUA_COMPAT_MODULE" From a13f3cd9c45566681dad49c3098410e9fe9c32bebf2e9f8b8dce98644585b9b2 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Tue, 10 Mar 2015 12:05:05 +0000 Subject: [PATCH 2/3] - Move shared library to libquvi%{soname} to conform to Shared Library Packaging Policy and allow parallel installation of more versions even without multiversion. - Use last change date instead of build date. libquvi-fake-build-date.patch -> libquvi-stable-build-date.patch OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libquvi?expand=0&rev=17 --- libquvi-fake-build-date.patch | 13 ------------- libquvi-rpmlintrc | 7 ++++++- libquvi-stable-build-date.patch | 13 +++++++++++++ libquvi.changes | 9 +++++++++ libquvi.spec | 23 +++++++++++++++++------ 5 files changed, 45 insertions(+), 20 deletions(-) delete mode 100644 libquvi-fake-build-date.patch create mode 100644 libquvi-stable-build-date.patch diff --git a/libquvi-fake-build-date.patch b/libquvi-fake-build-date.patch deleted file mode 100644 index d5a6aec..0000000 --- a/libquvi-fake-build-date.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: configure -=================================================================== ---- configure.orig 2013-11-10 08:45:43.000000000 +0100 -+++ configure 2015-03-10 11:26:07.118800252 +0100 -@@ -14716,7 +14716,7 @@ - - - if test x"$DATE" != "xno"; then : -- build_time=`$DATE +"%F %T %z"` -+ build_time="0000-00-00 00:00:00 +0000" - fi - - cat >>confdefs.h <<_ACEOF diff --git a/libquvi-rpmlintrc b/libquvi-rpmlintrc index be4ee7e..5055c55 100644 --- a/libquvi-rpmlintrc +++ b/libquvi-rpmlintrc @@ -1 +1,6 @@ -addFilter("shlib-policy-name-error") +# It is versioned, but in a very non-standard way. +# See changes comment dated Wed Aug 14 09:08:35 UTC 2013. +addFilter("shlib-unversioned-lib") +# Upstream project has lib in its name and contains library. +# False match, probably due to a non-standard library name. +addFilter("shlib-policy-missing-lib") diff --git a/libquvi-stable-build-date.patch b/libquvi-stable-build-date.patch new file mode 100644 index 0000000..ddbf007 --- /dev/null +++ b/libquvi-stable-build-date.patch @@ -0,0 +1,13 @@ +Index: configure.ac +=================================================================== +--- configure.ac.orig ++++ configure.ac +@@ -71,7 +71,7 @@ AS_IF([test x"$A2X" = "xno" && test -d " + AC_MSG_ERROR([a2x is required to create man pages when building from git])]) + + AC_PATH_PROG([DATE], [date], [no]) +-AS_IF([test x"$DATE" != "xno"], [build_time=`$DATE +"%F %T %z"`]) ++AS_IF([test x"$DATE" != "xno"], [build_time=`TZ=UTC $DATE -r stamp-build-time +"%F %T %z"`]) + AC_DEFINE_UNQUOTED([BUILD_TIME], ["$build_time"], [We have build time]) + + BUILD_TIME="$build_time" diff --git a/libquvi.changes b/libquvi.changes index 7976ffc..9540216 100644 --- a/libquvi.changes +++ b/libquvi.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Mar 10 13:00:17 CET 2015 - sbrabec@suse.cz + +- Move shared library to libquvi%{soname} to conform to Shared + Library Packaging Policy and allow parallel installation of more + versions even without multiversion. +- Use last change date instead of build date. + libquvi-fake-build-date.patch -> libquvi-stable-build-date.patch + ------------------------------------------------------------------- Tue Mar 10 10:30:51 UTC 2015 - pgajdos@suse.com diff --git a/libquvi.spec b/libquvi.spec index 88f7557..dc37687 100644 --- a/libquvi.spec +++ b/libquvi.spec @@ -26,8 +26,11 @@ License: LGPL-2.1+ Group: System/Libraries Url: http://quvi.sourceforge.net/ Source: http://sourceforge.net/projects/quvi/files/0.9/libquvi/libquvi-0.9.4.tar.xz -# suse specific -Patch0: %{name}-fake-build-date.patch +# PATCH-FEATURE-OPENSUSE libquvi-stable-build-date.patch sbrabec@suse.cz -- Don't embed build date. Triggers rebuild. +Patch0: %{name}-stable-build-date.patch +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool BuildRequires: lua-devel # For pkgconfig() Provides BuildRequires: libgcrypt-devel @@ -46,6 +49,9 @@ URLs with C API. Summary: Library to parse flash media stream URLs Group: System/Libraries Recommends: libquvi-scripts +# Up to openSUSE 13.2 and SLE 12 *.so files were in the main package. Now it does not exist. +Provides: libquvi = %{version}-%{release} +Obsoletes: libquvi < %{version}-%{release} %description -n libquvi%{soname} libquvi is a cross-platform library for parsing flash media stream @@ -54,7 +60,7 @@ URLs with C API. %package devel Summary: Library to parse flash media stream URLs -- Development Files Group: Development/Libraries/C and C++ -Requires: libquvi = %{version} +Requires: libquvi%{soname} = %{version} %description devel libquvi is a cross-platform library for parsing flash media stream @@ -62,10 +68,15 @@ URLs with C API. %prep %setup -q +if test -f %{_sourcedir}/%{name}.changes ; then %patch0 +echo "timestamp for BUILD_TIME" >stamp-build-time +touch -d "$(sed -n '2s/ - .*$//p' <%{_sourcedir}/%{name}.changes)" stamp-build-time +fi %build export CFLAGS="%{optflags} -DLUA_COMPAT_MODULE" +autoreconf -f -i %configure \ --disable-static make %{?_smp_mflags} @@ -74,11 +85,11 @@ make %{?_smp_mflags} %make_install find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print -%post -p /sbin/ldconfig +%post -n libquvi%{soname} -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%postun -n libquvi%{soname} -p /sbin/ldconfig -%files +%files -n libquvi%{soname} %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING NEWS README %{_libdir}/*.so From 62581a4c4f0594d247e2231243626742ff3e9fd13e9fc78ac528b6abe35e200a Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Tue, 10 Mar 2015 12:50:29 +0000 Subject: [PATCH 3/3] - Add libquvi.rpmlintrc to spec file and update skipped checks. OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libquvi?expand=0&rev=18 --- libquvi.changes | 1 + libquvi-rpmlintrc => libquvi.rpmlintrc | 0 libquvi.spec | 1 + 3 files changed, 2 insertions(+) rename libquvi-rpmlintrc => libquvi.rpmlintrc (100%) diff --git a/libquvi.changes b/libquvi.changes index 9540216..1222585 100644 --- a/libquvi.changes +++ b/libquvi.changes @@ -6,6 +6,7 @@ Tue Mar 10 13:00:17 CET 2015 - sbrabec@suse.cz versions even without multiversion. - Use last change date instead of build date. libquvi-fake-build-date.patch -> libquvi-stable-build-date.patch +- Add libquvi.rpmlintrc to spec file and update skipped checks. ------------------------------------------------------------------- Tue Mar 10 10:30:51 UTC 2015 - pgajdos@suse.com diff --git a/libquvi-rpmlintrc b/libquvi.rpmlintrc similarity index 100% rename from libquvi-rpmlintrc rename to libquvi.rpmlintrc diff --git a/libquvi.spec b/libquvi.spec index dc37687..b84b807 100644 --- a/libquvi.spec +++ b/libquvi.spec @@ -26,6 +26,7 @@ License: LGPL-2.1+ Group: System/Libraries Url: http://quvi.sourceforge.net/ Source: http://sourceforge.net/projects/quvi/files/0.9/libquvi/libquvi-0.9.4.tar.xz +Source1: %{name}.rpmlintrc # PATCH-FEATURE-OPENSUSE libquvi-stable-build-date.patch sbrabec@suse.cz -- Don't embed build date. Triggers rebuild. Patch0: %{name}-stable-build-date.patch BuildRequires: autoconf