Hello community,

here is the log from the commit of package gcolor2 for openSUSE:Factory checked 
in at 2020-06-22 17:46:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gcolor2 (Old)
 and      /work/SRC/openSUSE:Factory/.gcolor2.new.2956 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "gcolor2"

Mon Jun 22 17:46:48 2020 rev:4 rq:816364 version:0.4

Changes:
--------
--- /work/SRC/openSUSE:Factory/gcolor2/gcolor2.changes  2016-03-17 
16:47:26.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.gcolor2.new.2956/gcolor2.changes        
2020-06-22 17:46:49.906021269 +0200
@@ -1,0 +2,6 @@
+Mon Jun 22 13:07:13 UTC 2020 - Martin Pluskal <[email protected]>
+
+- Fix building with gcc10
+- Modernise spec file with spec-cleaner
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ gcolor2.spec ++++++
--- /var/tmp/diff_new_pack.2sxb92/_old  2020-06-22 17:46:50.610023477 +0200
+++ /var/tmp/diff_new_pack.2sxb92/_new  2020-06-22 17:46:50.614023490 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package gcolor2
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,33 +12,29 @@
 # 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 iconsdir %{_datadir}/icons/hicolor
 Name:           gcolor2
 Version:        0.4
 Release:        0
 Summary:        Simple color selector
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          Productivity/Graphics/Other
-Url:            http://gcolor2.sourceforge.net/
+URL:            http://gcolor2.sourceforge.net/
 Source0:        
http://prdownloads.sourceforge.net/gcolor2/%{name}-%{version}.tar.bz2
 Source1:        gcolor2-pofiles.tar.bz2
 Source2:        gcolor2.desktop
 # add missing headers, function declarations and translation symbols to fix 
warnings
 Patch0:         gcolor2-0.4-warnings.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  ImageMagick
 BuildRequires:  gtk2-devel
 BuildRequires:  intltool
 BuildRequires:  libtool
 BuildRequires:  update-desktop-files
 BuildRequires:  perl(XML::Parser)
-%if 0%{?fedora} >= 15
-BuildRequires:  sane-backends-libs
-%endif
-%define iconsdir %{_datadir}/icons/hicolor
 
 %description 
 Gcolor2 is a GTK2 color selector to provide a quick and easy way to find
@@ -52,44 +48,34 @@
 echo "gcolor2.glade" >> po/POTFILES.in
 autoreconf -fiv
 intltoolize --force
-
+export CFLAGS="%{optflags} -fcommon"
 %configure
 #languages not detected
 pushd po
 sed -i s/"ALL_LINGUAS ="/"ALL_LINGUAS = `ls *.po | cut -d. -f1 | xargs`"/"" 
Makefile
 popd
 
-%{__make}
+%make_build
 
 %install
-%makeinstall
+%make_install
 
 # Menu
-%{__mkdir_p} %{buildroot}%{_datadir}/applications
-install -m 644 %{S:2} %{buildroot}%{_datadir}/applications/%{name}.desktop
+mkdir -p %{buildroot}%{_datadir}/applications
+install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/applications/%{name}.desktop
 
 #icons
 for size in 16 32 48; do
        SIZE="${size}x${size}"
-       %{__mkdir_p} %{buildroot}%{iconsdir}/$SIZE/apps
+       mkdir -p %{buildroot}%{iconsdir}/$SIZE/apps
        convert -strip -scale $SIZE pixmaps/icon.png 
%{buildroot}%{iconsdir}/$SIZE/apps/%{name}.png
 done
 
 %find_lang %{name}
 
-%if %{suse_version} >= 1230
-%post
-%desktop_database_post
-%icon_theme_cache_post
-
-%postun
-%desktop_database_postun
-%icon_theme_cache_postun
-%endif
-
 %files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING
+%license COPYING
+%doc AUTHORS ChangeLog
 %{_bindir}/gcolor2
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/%{name}


Reply via email to