commit audacious for openSUSE:Factory
Hello community, here is the log from the commit of package audacious for openSUSE:Factory checked in at 2017-10-30 21:18:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/audacious (Old) and /work/SRC/openSUSE:Factory/.audacious.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "audacious" Mon Oct 30 21:18:33 2017 rev:3 rq:537411 version:3.9 Changes: -------- --- /work/SRC/openSUSE:Factory/audacious/audacious.changes 2017-08-24 18:56:41.881100043 +0200 +++ /work/SRC/openSUSE:Factory/.audacious.new/audacious.changes 2017-10-30 21:18:52.790335441 +0100 @@ -1,0 +2,10 @@ +Sun Oct 29 11:49:17 UTC 2017 - olaf@aepfle.de + +- Remove the versioned conditional for Qt build. + It builds fine in PackageHub, and audacious-plugins expects the + Qt variant. +- Remove Qt and GTK conditionals, they are always enabled and the + name is too generic +- Remove conditional for appdata for obsolete Leap 42.1 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ audacious.spec ++++++ --- /var/tmp/diff_new_pack.js2H7o/_old 2017-10-30 21:18:54.270281633 +0100 +++ /var/tmp/diff_new_pack.js2H7o/_new 2017-10-30 21:18:54.274281487 +0100 @@ -22,12 +22,6 @@ %define qt_soname 2 %define gui_soname 5 %define tag_soname 3 -%if 0%{?suse_version} >= 1320 || (0%{?sle_version} >= 120100 && 0%{?is_opensuse}) -%bcond_without qt -%else -%bcond_with qt -%endif -%bcond_without gtk Name: audacious Version: 3.9 Release: 0 @@ -55,14 +49,10 @@ Requires: %{name}-plugins%{?_isa} >= %{aud_plugin_ver_min} Recommends: %{name}-lang Recommends: %{name}-plugins-extra >= %{aud_plugin_ver_min} -%if %{with gtk} BuildRequires: pkgconfig(gtk+-3.0) >= 3.4 -%endif -%if %{with qt} BuildRequires: pkgconfig(Qt5Core) >= 5.2 BuildRequires: pkgconfig(Qt5Gui) >= 5.2 BuildRequires: pkgconfig(Qt5Widgets) >= 5.2 -%endif %description Audacious is an audio player. It is based on GTK+ and supports a wide @@ -80,7 +70,6 @@ %description -n libaudcore%{core_soname} Library from the Audacious audio player. -%if %{with qt} %package -n libaudqt%{qt_soname} Summary: QT GUI implementation of Audacious Group: System/Libraries @@ -88,9 +77,7 @@ %description -n libaudqt%{qt_soname} Library from the Audacious audio player. -%endif -%if %{with gtk} %package -n libaudgui%{gui_soname} Summary: GTK GUI implementation of Audacious Group: System/Libraries @@ -98,7 +85,6 @@ %description -n libaudgui%{gui_soname} Library from the Audacious audio player. -%endif %package -n libaudtag%{tag_soname} Summary: ID3 and APE metadata support for Audacious @@ -113,12 +99,8 @@ Group: Development/Libraries/C and C++ Requires: libaudcore%{core_soname} = %{version} Requires: libaudtag%{tag_soname} = %{version} -%if %{with qt} Requires: libaudqt%{qt_soname} = %{version} -%endif -%if %{with gtk} Requires: libaudgui%{gui_soname} = %{version} -%endif %description devel Development files for Audacious audio player. @@ -130,26 +112,14 @@ %build NOCONFIGURE=1 ./autogen.sh %configure \ -%if %{with qt} --enable-qt \ -%else - --disable-qt \ -%endif -%if %{with gtk} --enable-gtk \ -%else - --disable-gtk \ -%endif --disable-rpath make %{?_smp_mflags} V=1 %install %make_install -%if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120200 install -Dpm 0644 contrib/%{name}.appdata.xml %{buildroot}%{_datadir}/metainfo/%{name}.appdata.xml -%else -install -Dpm 0644 contrib/%{name}.appdata.xml %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml -%endif %find_lang %{name} %fdupes %{buildroot}%{_datadir}/ @@ -165,17 +135,13 @@ %postun -n libaudcore%{core_soname} -p /sbin/ldconfig -%if %{with qt} %post -n libaudqt%{qt_soname} -p /sbin/ldconfig %postun -n libaudqt%{qt_soname} -p /sbin/ldconfig -%endif -%if %{with gtk} %post -n libaudgui%{gui_soname} -p /sbin/ldconfig %postun -n libaudgui%{gui_soname} -p /sbin/ldconfig -%endif %post -n libaudtag%{tag_soname} -p /sbin/ldconfig @@ -189,13 +155,8 @@ %{_datadir}/%{name}/ %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}* -%if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120200 %dir %{_datadir}/metainfo/ %{_datadir}/metainfo/%{name}.appdata.xml -%else -%dir %{_datadir}/appdata/ -%{_datadir}/appdata/%{name}.appdata.xml -%endif %{_mandir}/man?/%{name}.?%{?ext_man} %{_mandir}/man?/audtool.?%{?ext_man} @@ -206,17 +167,13 @@ %defattr(-,root,root) %{_libdir}/libaudcore.so.%{core_soname}* -%if %{with qt} %files -n libaudqt%{qt_soname} %defattr(-,root,root) %{_libdir}/libaudqt.so.%{qt_soname}* -%endif -%if %{with gtk} %files -n libaudgui%{gui_soname} %defattr(-,root,root) %{_libdir}/libaudgui.so.%{gui_soname}* -%endif %files -n libaudtag%{tag_soname} %defattr(-,root,root) @@ -227,14 +184,10 @@ %{_includedir}/%{name}/ %{_includedir}/libaudcore/ %{_libdir}/libaudcore.so -%if %{with qt} %{_includedir}/libaudqt/ %{_libdir}/libaudqt.so -%endif -%if %{with gtk} %{_includedir}/libaudgui/ %{_libdir}/libaudgui.so -%endif %{_libdir}/libaudtag.so %{_libdir}/pkgconfig/%{name}.pc
participants (1)
-
root@hilbert.suse.de