Hello community, here is the log from the commit of package gnonograms for openSUSE:Factory checked in at 2019-12-24 14:30:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnonograms (Old) and /work/SRC/openSUSE:Factory/.gnonograms.new.6675 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnonograms" Tue Dec 24 14:30:06 2019 rev:5 rq:759017 version:1.4.3 Changes: -------- --- /work/SRC/openSUSE:Factory/gnonograms/gnonograms.changes 2019-11-26 17:02:39.716042361 +0100 +++ /work/SRC/openSUSE:Factory/.gnonograms.new.6675/gnonograms.changes 2019-12-24 14:30:12.182582713 +0100 @@ -1,0 +2,6 @@ +Mon Dec 23 17:45:04 UTC 2019 - Alexei Podvalsky <[email protected]> + +- Update to 1.4.3: + * Revert separate library; compile core into executable + +------------------------------------------------------------------- Old: ---- gnonograms-1.4.2.tar.gz New: ---- gnonograms-1.4.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnonograms.spec ++++++ --- /var/tmp/diff_new_pack.Jq117m/_old 2019-12-24 14:30:12.802583013 +0100 +++ /var/tmp/diff_new_pack.Jq117m/_new 2019-12-24 14:30:12.806583015 +0100 @@ -15,11 +15,8 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%define soname libgnonograms-core -%define sover 0 - Name: gnonograms -Version: 1.4.2 +Version: 1.4.3 Release: 0 Summary: Program for creating and solving gnonogram puzzles License: GPL-3.0-or-later @@ -42,32 +39,11 @@ %description An implementation of the Japanese logic puzzle "Nonograms". -%package -n %{soname}%{sover} -Summary: The core library for %{name} -Group: System/Libraries - -%description -n %{soname}%{sover} -An implementation of the Japanese logic puzzle "Nonograms". - -This package contains the shared library. - -%package devel -Summary: Development Files for %{name} -Group: Development/Libraries/Other -Requires: %{soname}%{sover} = %{version} - -%description devel -An implementation of the Japanese logic puzzle "Nonograms". - -This package contains the development files for %{name}. - %lang_package %prep %setup -q -sed -i 's/\bmetainfo\b/appdata/' $(grep -rwl 'metainfo') - %build %meson %meson_build @@ -81,28 +57,16 @@ %find_lang com.github.jeremypw.gnonograms %{name}.lang %fdupes %{buildroot}/%{_datadir} -%post -n %{soname}%{sover} -p /sbin/ldconfig -%postun -n %{soname}%{sover} -p /sbin/ldconfig - %files %license LICENSE %doc README.md %{_bindir}/com.github.jeremypw.gnonograms -%{_datadir}/appdata/com.github.jeremypw.gnonograms.appdata.xml +%{_datadir}/metainfo/com.github.jeremypw.gnonograms.appdata.xml %{_datadir}/applications/com.github.jeremypw.gnonograms.desktop %{_datadir}/icons/hicolor/*/*/*.??g %{_datadir}/glib-2.0/schemas/com.github.jeremypw.gnonograms.gschema.xml %{_datadir}/mime/packages/com.github.jeremypw.gnonograms.mimeinfo.xml -%files -n %{soname}%{sover} -%{_libdir}/%{soname}.so.* - -%files devel -%{_includedir}/gnonograms-core.h -%{_libdir}/%{soname}.so -%{_libdir}/pkgconfig/gnonograms-core.pc -%{_datadir}/vala/vapi/gnonograms-core.* - %files lang -f %{name}.lang %changelog ++++++ gnonograms-1.4.2.tar.gz -> gnonograms-1.4.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnonograms-1.4.2/data/com.github.jeremypw.gnonograms.appdata.xml.in new/gnonograms-1.4.3/data/com.github.jeremypw.gnonograms.appdata.xml.in --- old/gnonograms-1.4.2/data/com.github.jeremypw.gnonograms.appdata.xml.in 2019-11-22 17:48:43.000000000 +0100 +++ new/gnonograms-1.4.3/data/com.github.jeremypw.gnonograms.appdata.xml.in 2019-12-10 17:47:20.000000000 +0100 @@ -52,12 +52,11 @@ <category>LogicGame</category> </categories> <releases> - <release version="1.4.2" date="2019-11-20" urgency="low"> + <release version="1.4.3" date="2019-12-10" urgency="low"> <description> <ul> <li>French translations</li> <li>Redesigned headerbar</li> - <li>Use separate gnonograms library</li> <li>Commandline options</li> <li>Fix CI and testing</li> <li>Minor bug fixes</li> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnonograms-1.4.2/data/post_uninstall.py.in new/gnonograms-1.4.3/data/post_uninstall.py.in --- old/gnonograms-1.4.2/data/post_uninstall.py.in 2019-11-22 17:48:43.000000000 +0100 +++ new/gnonograms-1.4.3/data/post_uninstall.py.in 2019-12-10 17:47:20.000000000 +0100 @@ -12,12 +12,6 @@ tmp_dir_path1 = '/.local/share/' + 'gnonograms' + '/' tmp_dir_path2 = '/.local/share/' + 'Gnonograms' + '/' -libdir = "@lib_dir_path@" -libname = "@lib_name@" - -incdir = "@inc_dir_path@" -vapidir = "@vapi_dir_path@" - print('Compiling gsettings schemas…' + schemadir) subprocess.call(['glib-compile-schemas', schemadir]) print('Resetting dconf path …' + schemapath) @@ -36,12 +30,3 @@ subprocess.call(['rm', '-R', homedir + tmp_dir_path1]); subprocess.call(['rm', '-R', homedir + tmp_dir_path2]); print ('You must manually remove any games directories you created') - -print('Removing gnonograms-core library') -subprocess.call(['rm', '-f', os.path.join (libdir, 'lib' + libname + ".*")]); - -print('Removing gnonograms-core header') -subprocess.call(['rm', '-f', os.path.join (incdir, libname + ".h")]); - -print('Removing gnonograms-core vapi') -subprocess.call(['rm', '-f', os.path.join (vapidir, libname + ".vapi")]); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnonograms-1.4.2/libcore/Constants.vala new/gnonograms-1.4.3/libcore/Constants.vala --- old/gnonograms-1.4.2/libcore/Constants.vala 2019-11-22 17:48:43.000000000 +0100 +++ new/gnonograms-1.4.3/libcore/Constants.vala 2019-12-10 17:47:20.000000000 +0100 @@ -20,7 +20,7 @@ */ namespace Gnonograms { - public const string VERSION = "1.4.2"; + public const string VERSION = "1.4.3"; public const Cell NULL_CELL = { uint.MAX, uint.MAX, CellState.UNDEFINED }; public const uint MAXSIZE = 50; // max number rows or columns public const uint MINSIZE = 5; // Change to 1 when debugging diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnonograms-1.4.2/meson.build new/gnonograms-1.4.3/meson.build --- old/gnonograms-1.4.2/meson.build 2019-11-22 17:48:43.000000000 +0100 +++ new/gnonograms-1.4.3/meson.build 2019-12-10 17:47:20.000000000 +0100 @@ -1,13 +1,10 @@ -project ('com.github.jeremypw.gnonograms', 'vala', 'c', meson_version: '>= 0.42.0') +project ('com.github.jeremypw.gnonograms', 'vala', 'c', version: '1.4.3', meson_version: '>= 0.42.0') shortname = 'gnonograms' domain = 'com.github.jeremypw.' schema_path = '/com/github/jeremypw/' + shortname + '/' vala_version_required = '0.34.0' -libver = '1.4.2' -libname = shortname + '-core' - i18n = import ('i18n') add_global_arguments ( @@ -19,8 +16,16 @@ GEE = dependency('gee-0.8', version: '>=0.20', required: true) GRANITE= dependency('granite', version: '>=5.2.0', required: true) -lib = shared_library ( - libname, +executable ( + meson.project_name (), + 'src/Application.vala', + 'src/Controller.vala', + 'src/View.vala', + 'src/RandomPatternGenerator.vala', + 'src/SimpleRandomGameGenerator.vala', + 'src/widgets/AppMenu.vala', + 'src/widgets/ViewModeButton.vala', + 'src/widgets/ProgressIndicator.vala', 'libcore/widgets/AbstractAppSetting.vala', 'libcore/widgets/GradeChooser.vala', 'libcore/widgets/ScaleGrid.vala', @@ -52,41 +57,7 @@ GRANITE ], - install: true, - install_dir: [true, true, true], - version: libver, - soversion: '0' -) - -pkg = import ('pkgconfig') -pkg.generate ( - description: 'Core functions for gnonograms and gnonogram-tools', - filebase: 'gnonograms-core', - libraries: lib, - name: libname, - version: libver, - requires: ['gtk+-3.0', 'gee-0.8', 'granite'] -) - -executable ( - meson.project_name (), - 'src/Application.vala', - 'src/Controller.vala', - 'src/View.vala', - 'src/RandomPatternGenerator.vala', - 'src/SimpleRandomGameGenerator.vala', - 'src/widgets/AppMenu.vala', - 'src/widgets/ViewModeButton.vala', - 'src/widgets/ProgressIndicator.vala', - - dependencies : [ - GTK3, - GEE, - GRANITE - ], - - install: true, - link_with: lib + install: true ) @@ -98,10 +69,6 @@ uninstall_data.set('icon_dir_path', join_paths(get_option('prefix'), get_option('datadir'), 'icons', 'hicolor')) uninstall_data.set('mime_dir_path', join_paths(get_option('prefix'), get_option('datadir'), 'mime', 'packages')) uninstall_data.set('desktop_dir_path', join_paths(get_option('prefix'), get_option('datadir'), 'applications')) -uninstall_data.set('lib_dir_path', join_paths(get_option('prefix'), get_option('libdir'))) -uninstall_data.set('inc_dir_path', join_paths(get_option('prefix'), get_option('includedir'))) -uninstall_data.set('vapi_dir_path', join_paths(get_option('prefix'), get_option('datadir'), 'vala', 'vapi')) -uninstall_data.set('lib_name', libname) configure_file ( input: join_paths (meson.source_root (), 'data', 'post_uninstall.py.in'),
