Hello community, here is the log from the commit of package libkate for openSUSE:Factory checked in at 2018-02-08 14:09:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkate (Old) and /work/SRC/openSUSE:Factory/.libkate.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libkate" Thu Feb 8 14:09:50 2018 rev:20 rq:573703 version:0.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/libkate/libkate.changes 2014-06-01 18:58:21.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libkate.new/libkate.changes 2018-02-08 14:09:46.731693239 +0100 @@ -1,0 +2,20 @@ +Wed Feb 7 12:31:30 UTC 2018 - [email protected] + +- Allow Leap:42.3 to build by defining %python2_sitearch to + python_sitearch. +- Use %license on license file. + +------------------------------------------------------------------- +Wed Feb 7 12:13:43 UTC 2018 - [email protected] + +- Mention baselibs.conf + +------------------------------------------------------------------- +Wed Feb 7 12:03:05 UTC 2018 - [email protected] + +- Make python2 dependency conditional bsc#1076407 +- Remove few path based requires/etc +- Conflict properly with older libkate in order to allow migration + and not clash with liboggkate1 library + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkate.spec ++++++ --- /var/tmp/diff_new_pack.X54n1B/_old 2018-02-08 14:09:47.483658129 +0100 +++ /var/tmp/diff_new_pack.X54n1B/_new 2018-02-08 14:09:47.487657943 +0100 @@ -1,7 +1,7 @@ # # spec file for package libkate # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2010 SUSE Dominique Leuenberger, Amsterdam, Netherlands # # All modifications and additions to the file contributed by third parties @@ -17,24 +17,29 @@ # +# python2_sitelib isn't defined in Leap:42.3 +%if 0%{?suse_version} < 1321 +%define python2_sitelib %{python_sitelib} +%endif + +%bcond_without python2 Name: libkate Version: 0.4.1 Release: 0 - -# "Other uncritical OpenSource License" is no longer allowed in the License field. - Summary: A karaoke and text codec for embedding in Ogg License: BSD-3-Clause Group: Productivity/Multimedia/Other Url: http://libkate.googlecode.com Source: http://libkate.googlecode.com/files/%{name}-%{version}.tar.gz +Source99: baselibs.conf BuildRequires: doxygen BuildRequires: fdupes -BuildRequires: libogg-devel -BuildRequires: libpng-devel -BuildRequires: pkg-config -BuildRequires: python-base -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: pkgconfig +BuildRequires: pkgconfig(libpng) +BuildRequires: pkgconfig(ogg) +%if %{with python2} +BuildRequires: python2-base +%endif %description Kate is a codec for karaoke and text encapsulation for Ogg. Most of the @@ -49,7 +54,6 @@ color, etc, so scrolling or fading text can be defined. %package -n %{name}1 - Summary: A karaoke and text codec for embedding in Ogg Group: System/Libraries @@ -66,11 +70,9 @@ color, etc, so scrolling or fading text can be defined. %package -n liboggkate1 - Summary: A karaoke and text codec for embedding in Ogg Group: System/Libraries -Provides: %{_libdir}/liboggkate.so.1 -Obsoletes: libkate1 < 0.4.1 +Conflicts: libkate1 < 0.4.1 %description -n liboggkate1 Kate is a codec for karaoke and text encapsulation for Ogg. Most of the @@ -89,8 +91,8 @@ Group: Development/Libraries/C and C++ Requires: %{name}1 = %{version} Requires: glibc-devel -Requires: libogg-devel Requires: liboggkate1 = %{version} +Requires: pkgconfig(ogg) %description devel Kate is a codec for karaoke and text encapsulation for Ogg. Most of the @@ -125,17 +127,12 @@ %package -n python-katedj Summary: Editor and remixer for Kate streams in Ogg Group: Productivity/Multimedia/Other -Provides: katedj = 0.4.1 -Obsoletes: katedj < 0.4.1 -Requires: %{_bindir}/oggz-merge -Requires: %{_bindir}/oggz-rip Requires: %{name}-tools = %{version} +Requires: oggz-tools Requires: python-wxWidgets -%py_requires -Recommends: %{_bindir}/oggz-known-codecs -%if %{?suse_version} >= 1130 +Provides: katedj = 0.4.1 +Obsoletes: katedj < 0.4.1 BuildArch: noarch -%endif %description -n python-katedj KateDJ allows extracting Kate tracks embedded in an Ogg stream, editing @@ -148,38 +145,38 @@ echo 'HTML_TIMESTAMP=NO' >> doc/kate.doxygen.in %configure \ --disable-static -%__make %{_smp_mflags} +make %{?_smp_mflags} %install -%makeinstall +%make_install find %{buildroot} -type f -name "*.la" -delete -print # Remove files that we install with %%doc rm -rf %{buildroot}%{_datadir}/doc/%{name}/{AUTHORS,COPYING,ChangeLog,README,THANKS,html} +%if %{with python2} %fdupes %{buildroot}%{python_sitelib}/kdj +%else +rm -rf %{buildroot}%{_mandir}/man1/KateDJ.1* +%endif %check -make check +make %{?_smp_mflags} check %post -n %{name}1 -p /sbin/ldconfig - %postun -n %{name}1 -p /sbin/ldconfig %files -n %{name}1 -%defattr(-, root, root) -%doc AUTHORS COPYING ChangeLog README THANKS +%doc AUTHORS ChangeLog README THANKS +%license COPYING %{_libdir}/%{name}.so.1* %post -n liboggkate1 -p /sbin/ldconfig - %postun -n liboggkate1 -p /sbin/ldconfig %files -n liboggkate1 -%defattr(-, root, root) %doc AUTHORS COPYING ChangeLog README THANKS %{_libdir}/liboggkate.so.1* %files devel -%defattr(-, root, root) %doc doc/html/ %{_includedir}/kate/ %{_libdir}/%{name}.so @@ -188,7 +185,6 @@ %{_libdir}/pkgconfig/oggkate.pc %files tools -%defattr(-, root, root) %{_bindir}/katedec %{_bindir}/kateenc %{_bindir}/katalyzer @@ -196,10 +192,11 @@ %{_mandir}/man1/katedec.1* %{_mandir}/man1/kateenc.1* +%if %{with python2} %files -n python-katedj -%defattr(-, root, root) %{_bindir}/KateDJ %{_mandir}/man1/KateDJ.1* -%{python_sitelib}/kdj/ +%{python2_sitelib}/kdj/ +%endif %changelog
