From b128aa92842cbbf1785895a9ceb37d1c04c6ae7326899e5c0e23da35f0eee62c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Mon, 27 Mar 2017 11:57:02 +0000
Subject: [PATCH] Accepting request 482673 from
 home:Zaitor:branches:multimedia:libs

Suggest change, how this affects 3'd party repos like packman has to taken into account, but I think it should be fine, however maintainers have to decide this.

OBS-URL: https://build.opensuse.org/request/show/482673
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libquicktime?expand=0&rev=68
---
 libquicktime.changes | 10 ++++++++++
 libquicktime.spec    | 47 ++++++++++++++++++++++++++++++++++++--------
 2 files changed, 49 insertions(+), 8 deletions(-)

diff --git a/libquicktime.changes b/libquicktime.changes
index 2ff5119..b932d49 100644
--- a/libquicktime.changes
+++ b/libquicktime.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sat Feb 25 21:11:11 UTC 2017 - zaitor@opensuse.org
+
+- Move unversioned so files to previously not built main package.
+- Following this, split out a new sub-package
+  libquicktime-orig-addon, built depending on macro BUILD_ORIG.
+- Split out a new lang subpackage.
+- Stop providing/obsoleting libquicktime last available in openSUSE
+  11.4.
+
 -------------------------------------------------------------------
 Thu Feb 16 18:56:46 UTC 2017 - jengelh@inai.de
 
diff --git a/libquicktime.spec b/libquicktime.spec
index debdcf7..fb2be5b 100644
--- a/libquicktime.spec
+++ b/libquicktime.spec
@@ -61,6 +61,7 @@ BuildRequires:  pkgconfig(xext)
 BuildRequires:  pkgconfig(xt)
 BuildRequires:  pkgconfig(xv)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%if 0%{?BUILD_ORIG}
 %if %{with faac}
 BuildRequires:  libfaac-devel
 %endif
@@ -73,17 +74,25 @@ BuildRequires:  libmp3lame-devel
 %if %{with x264}
 BuildRequires:  libx264-devel
 %endif
+%endif
 
 %description
 A library for reading and writing Quicktime movie files, based on and
 forked from quicktime4linux.
 
+%if 0%{?BUILD_ORIG}
+%package orig-addon
+Summary:        Library for Reading and Writing Quicktime Movie Files
+Group:          System/Libraries
+
+%description orig-addon
+A library for reading and writing Quicktime movie files, based on and
+forked from quicktime4linux.
+%endif
+
 %package -n %{name}%{sover}
 Summary:        Library for Reading and Writing Quicktime Movie Files
-# Last version with this name was openSUSE 11.4
 Group:          System/Libraries
-Provides:       libquicktime = %{version}-%{release}
-Obsoletes:      libquicktime <= 1.2.2
 
 %description -n %{name}%{sover}
 A library for reading and writing Quicktime movie files, based on and
@@ -92,7 +101,11 @@ forked from quicktime4linux.
 %package -n libquicktime-devel
 Summary:        Library for reading/writing quicktime movie files
 Group:          Development/Libraries/C and C++
+Requires:       %{name} = %{version}
 Requires:       %{name}%{sover} = %{version}
+%if 0%{?BUILD_ORIG}
+Requires:       %{name}-orig-addon = %{version}
+%endif
 
 %description -n libquicktime-devel
 library for reading/writing quicktime movie files, based on and forked
@@ -101,11 +114,17 @@ from quicktime4linux
 %package -n libquicktime-tools
 Summary:        Libquicktime Tools
 Group:          Productivity/Multimedia/Video/Editors and Convertors
+Requires:       %{name} = %{version}
 Requires:       %{name}%{sover} = %{version}
+%if 0%{?BUILD_ORIG}
+Requires:       %{name}-orig-addon = %{version}
+%endif
 
 %description -n libquicktime-tools
 Tools for reading/writing quicktime movie files.
 
+%lang_package
+
 %prep
 %setup -q -n %{name}
 %patch0 -p1
@@ -130,18 +149,16 @@ make %{?_smp_mflags}
 %install
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
 ln -s lqt "%{buildroot}%{_includedir}/quicktime"
-%find_lang libquicktime
+%find_lang %{name} %{?no_lang_C}
 find %{buildroot} -type f -name "*.la" -delete -print
 
 %post   -n libquicktime%{sover} -p /sbin/ldconfig
 
 %postun -n libquicktime%{sover} -p /sbin/ldconfig
 
-%files -n libquicktime%{sover} -f libquicktime.lang
+%files
 %defattr(0644,root,root,0755)
-%doc COPYING ChangeLog README TODO
-%{_libdir}/libquicktime.so.%{sover}
-%{_libdir}/libquicktime.so.%{sover}.*.*
+%doc ChangeLog README TODO
 %dir %{_libdir}/libquicktime
 %{_libdir}/libquicktime/lqt_audiocodec.so
 %{_libdir}/libquicktime/lqt_dv.so
@@ -154,6 +171,10 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %if %{with ffmpeg}
 %{_libdir}/libquicktime/lqt_ffmpeg.so
 %endif
+
+%if 0%{?BUILD_ORIG}
+%files orig-addon
+%defattr(0644,root,root,0755)
 %if %{with faac}
 %{_libdir}/libquicktime/lqt_faac.so
 %endif
@@ -166,6 +187,13 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %if %{with x264}
 %{_libdir}/libquicktime/lqt_x264.so
 %endif
+%endif
+
+%files -n libquicktime%{sover}
+%defattr(0644,root,root,0755)
+%doc COPYING
+%{_libdir}/libquicktime.so.%{sover}
+%{_libdir}/libquicktime.so.%{sover}.*.*
 
 %files -n libquicktime-devel
 %defattr(0644,root,root,0755)
@@ -190,4 +218,7 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %{_bindir}/qtyuv4toyuv
 %{_mandir}/man1/lqtplay.1%{ext_man}
 
+%files lang -f %{name}.lang
+%defattr(-,root,root)
+
 %changelog