Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ladish for openSUSE:Factory checked in at 2021-04-17 23:24:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ladish (Old) and /work/SRC/openSUSE:Factory/.ladish.new.12324 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ladish" Sat Apr 17 23:24:51 2021 rev:2 rq:886151 version:1+git.20210227 Changes: -------- --- /work/SRC/openSUSE:Factory/ladish/ladish.changes 2020-12-22 15:58:05.626109345 +0100 +++ /work/SRC/openSUSE:Factory/.ladish.new.12324/ladish.changes 2021-04-17 23:24:55.757590387 +0200 @@ -1,0 +2,11 @@ +Sat Apr 17 00:33:33 UTC 2021 - Ferdinand Thiessen <r...@fthiessen.de> + +- Updated to git version + * Fixes package version, as last one already was 1 (+git) + * Fix load project dialog + * Fix GetAllPorts D-Bus method declaration +- Dropped upstream merged ladish-python3.patch, ladish.compile.patch +- Dropped bundled waf, upstream provided got updated +- Added ladish-version.patch to fix invalid version in some files + +------------------------------------------------------------------- Old: ---- ladish-0.3.150.g27e38d3f.tar.bz2 ladish-python3.patch ladish.compile.patch waf-2.0.20.tar.bz2 New: ---- _service ladish-1+git.20210227.obscpio ladish-version.patch ladish.obsinfo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ladish.spec ++++++ --- /var/tmp/diff_new_pack.nGE56B/_old 2021-04-17 23:24:56.333591368 +0200 +++ /var/tmp/diff_new_pack.nGE56B/_new 2021-04-17 23:24:56.337591375 +0200 @@ -1,7 +1,7 @@ # # spec file for package ladish # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,23 +12,20 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %define enable_gui 0 Name: ladish -Version: 0.3.150.g27e38d3f +Version: 1+git.20210227 Release: 0 Summary: LADI Session Handler License: GPL-2.0-or-later AND AFL-2.1 Group: Productivity/Multimedia/Sound/Utilities URL: http://ladish.org/ -Source: %{name}-%{version}.tar.bz2 -# old version of waf doesn't work with py3 -Source2: waf-2.0.20.tar.bz2 -Patch0: ladish.compile.patch -Patch1: ladish-python3.patch +Source: %{name}-%{version}.tar.xz +Patch0: ladish-version.patch BuildRequires: alsa-devel BuildRequires: autoconf BuildRequires: automake @@ -64,9 +61,6 @@ %autosetup -p1 %build -tar -xf %{SOURCE2} -cp waf-2.0.20/waf . -cp -r waf-2.0.20/waflib . export CFLAGS="%{optflags} -Wno-error" export CXXFLAGS="%{optflags} -Wno-unused-but-set-variable" # --enable-pylash doesn't work with py3 @@ -75,6 +69,8 @@ %install /usr/bin/python3 waf install --destdir=%{buildroot} +# We install it later correctly +rm -r %{buildroot}/%{_datadir}/doc %ifarch x86_64 mv "%{buildroot}/usr/lib" "%{buildroot}%{_libdir}" %endif @@ -91,8 +87,9 @@ %postun -p /sbin/ldconfig %files -%dir %{_datadir}/ladish -%{_datadir}/ladish/* +%license COPYING afl21.txt gpl2.txt +%doc AUTHORS NEWS README +%{_datadir}/ladish %{_bindir}/ladish_control %{_bindir}/ladishd %{_bindir}/jmcore @@ -105,12 +102,7 @@ %if %{enable_gui} %{_bindir}/gladish %{_datadir}/applications/gladish.desktop -%{_datadir}/icons/hicolor/16x16/apps/gladish.png -%{_datadir}/icons/hicolor/22x22/apps/gladish.png -%{_datadir}/icons/hicolor/24x24/apps/gladish.png -%{_datadir}/icons/hicolor/256x256/apps/gladish.png -%{_datadir}/icons/hicolor/32x32/apps/gladish.png -%{_datadir}/icons/hicolor/48x48/apps/gladish.png +%{_datadir}/icons/hicolor/*/apps/gladish.png %lang(de) %{_datadir}/locale/de/LC_MESSAGES/ladish.mo %lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/ladish.mo %lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/ladish.mo @@ -119,7 +111,5 @@ %exclude %{_includedir}/lash* %exclude %{_libdir}/liblash.so* %exclude %{_libdir}/pkgconfig/lash-1.0.pc -%exclude %{_libdir}/python2.7/site-packages/_lash.so -%exclude %{_libdir}/python2.7/site-packages/lash.py %changelog ++++++ _service ++++++ <services> <service name="obs_scm" mode="disabled"> <param name="scm">git</param> <param name="url">https://git.nedk.org/lad/ladish.git</param> <param name="versionprefix">1+git</param> <param name="versionformat">%cd</param> </service> <service name="set_version" mode="buildtime" /> <service name="tar" mode="buildtime" /> <service name="recompress" mode="buildtime"> <param name="file">*git*.tar</param> <param name="compression">xz</param> </service> </services> ++++++ ladish-version.patch ++++++ diff -Nur ladish-1+git.20210227/meson.build new/meson.build --- ladish-1+git.20210227/meson.build 2021-02-27 05:55:49.000000000 +0100 +++ new/meson.build 2021-04-17 02:21:01.188755702 +0200 @@ -1,5 +1,5 @@ project('ladish', 'c', 'cpp', - version : '0.3', + version : '1.0', license : 'MIT') data_dir = get_option('prefix') / 'share' / 'ladish' @@ -7,7 +7,7 @@ dbus_name_base = 'org.ladish' dbus_base_path = '/org/ladish' -git_version = run_command(['git', 'rev-parse', '--short', 'HEAD']).stdout().strip() +git_version = "-" configure_file(output : 'version.h', configuration : { ++++++ ladish.obsinfo ++++++ name: ladish version: 1+git.20210227 mtime: 1614401749 commit: 4be0b87b4cb353002ff96cbc3cef67245a9b7a1a
