Accepting request 818698 from home:edogawa

- update to version 1.3.1000
- remove non-ntk-1.3.0-fpermissive.patch (fixed upstream)
- run spec-cleaner, improve specfile following its proposals

OBS-URL: https://build.opensuse.org/request/show/818698
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/non-ntk?expand=0&rev=11

_service

@@ -0,0 +1,12 @@
+<services>
+  <service name="download_url" mode="localonly">
+    <param name="host">github.com</param>
+    <param name="protocol">https</param>
+    <param name="path">/original-male/ntk/archive/v1.3.1000.tar.gz</param>
+    <param name="filename">non-ntk-1.3.1000.tar.gz</param>
+  </service>
+  <service name="recompress" mode="localonly">
+    <param name="file">*.tar.gz</param>
+    <param name="compression">bz2</param>
+  </service>
+</services>

non-ntk-1.3.1000.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e6414b1aa36dd024b1ed9c4b72458d0a2ae9f92c5b3532665696a94cea87393e
+size 2400986

non-ntk.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jul  1 06:46:31 UTC 2020 - Edgar Aichinger <edogawa@aon.at>
+
+- update to version 1.3.1000
+- remove non-ntk-1.3.0-fpermissive.patch (fixed upstream)
+- run spec-cleaner, improve specfile following its proposals
+
 -------------------------------------------------------------------
 Sun Sep  8 08:57:04 UTC 2019 - Edgar Aichinger <edogawa@aon.at>
 

non-ntk.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package non-ntk
 #
-# Copyright (c) 2019 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
@@ -17,16 +17,15 @@
 
 
 Name:           non-ntk
-Version:        1.3.0
+Version:        1.3.1000
 Release:        0
 Summary:        A fork of FLTK for the non audio suite
-License:        GPL-2.0-or-later
-Group:          Applications/Multimedia
-
 # some codes are in GPLv2+ while FLTK derived code is LGPLv2+ (SUSE-FLTK)
 # since linking to the same binary together, restricted solely to GPL-2.0+
-URL:            http://non.tuxfamily.org/
+License:        GPL-2.0-or-later
-Source0:        non-ntk-%{version}-git5719b00.tar.bz2
+Group:          Development/Libraries/C and C++
+URL:            https://non.tuxfamily.org/
+Source0:        non-ntk-%{version}.tar.bz2
 # script to create source tarball from git
 # sh non-snapshot.sh $(rev)
 Source1:        non-ntk-snapshot.sh
@@ -35,39 +34,34 @@ Source2:        non-ntk-1.3.0-fluid.desktop
 # sent upstream via email
 Patch1:         non-ntk-1.3.0-fsf.patch
 Patch2:         non-ntk-unused-shlib.patch
-Patch3:         non-ntk-1.3.0-fpermissive.patch
-
-%if %{defined fedora}
-BuildRequires:  desktop-file-utils
-%endif
-%if 0%{?suse_version}
-BuildRequires:  gcc-c++
-BuildRequires:  update-desktop-files
-%endif
 BuildRequires:  cairo-devel
 BuildRequires:  libjpeg-devel
-BuildRequires:  python-base
+BuildRequires:  pkgconfig
 BuildRequires:  zlib-devel
 BuildRequires:  pkgconfig(glu)
 BuildRequires:  pkgconfig(libpng)
 BuildRequires:  pkgconfig(xft)
+# needed by ./waf
+BuildRequires:  python-base
+BuildRequires:  gcc-c++
+BuildRequires:  update-desktop-files
 
 %description
-The Non Tool Kit (NTK) is a fork of the Fast Light ToolKit library, adding 
+The Non Tool Kit (NTK) is a fork of the Fast Light ToolKit library, adding
-improved graphics rendering via Cairo, a streamlined and enhanced widget set, 
+improved graphics rendering via Cairo, a streamlined and enhanced widget set,
-and other features designed to improve the appearance and performance of the 
+and other features designed to improve the appearance and performance of the
 Non applications. NTK is included in the Non distribution.
 
 %package -n libntk1
-Summary:        Development files for %{name}.
+Summary:        Shared library files for %{name}
-Group:          Development/Libraries
+Group:          Development/Libraries/C and C++
 
 %description -n libntk1
 This package contains shared libraries for %{name}.
 
 %package devel
 Summary:        Development files for %{name}
-Group:          Development/Libraries
+Group:          Development/Libraries/C and C++
 Requires:       libntk1 = %{version}-%{release}
 
 %description devel
@@ -75,7 +69,7 @@ This package contains development files for %{name}.
 
 %package fluid
 Summary:        Fast Light User Interface Designer
-Group:          Applications/Multimedia
+Group:          Development/Tools/GUI Builders
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       %{name}-devel
 
@@ -83,10 +77,9 @@ Requires:       %{name}-devel
 %{summary}, an interactive GUI designer for %{name}.
 
 %prep
-%setup -q
+%setup -q -n ntk-%{version}
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 sed -i -e "s|append_value('C\(.*\)FLAGS', CFLAGS|append_value('C\1FLAGS','%{optflags}'.split(' ')|" \
  wscript
@@ -94,9 +87,9 @@ sed -i -e "s|append_value('C\(.*\)FLAGS', CFLAGS|append_value('C\1FLAGS','%{optf
 %build
 LDFLAGS="%{?__global_ldflags}" ./waf -v configure --prefix=%{_prefix} \
   --libdir=%{_libdir} --enable-gl
-./waf -v %{?_smp_mflags} 
+./waf -v %{?_smp_mflags}
 
-%install 
+%install
 ./waf -v install --destdir=%{buildroot}
 install -d -m 0755 %{buildroot}%{_datadir}/applications
 install -D -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/applications/ntk-fluid.desktop
@@ -107,28 +100,23 @@ rm %{buildroot}%{_libdir}/libntk*.a*
 %endif
 
 %post -n libntk1 -p /sbin/ldconfig
-
 %postun -n libntk1 -p /sbin/ldconfig
-
 %postun fluid
 update-desktop-database -q &> /dev/null
 
-%post fluid 
+%post fluid
-update-desktop-database -q &> /dev/null 
+update-desktop-database -q &> /dev/null
 
 %check
 desktop-file-validate %{buildroot}%{_datadir}/applications/ntk-fluid.desktop
 
 %files
-%defattr(-,root,root)
 %license COPYING
 
 %files -n libntk1
-%defattr(-,root,root)
 %{_libdir}/libntk*.so.*
 
 %files devel
-%defattr(-,root,root)
 %{_libdir}/libntk.so
 %{_libdir}/libntk_images.so
 %{_libdir}/libntk_gl.so
@@ -136,7 +124,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/ntk-fluid.desktop
 %{_libdir}/pkgconfig/*
 
 %files fluid
-%defattr(-,root,root)
 %{_datadir}/applications/ntk-fluid.desktop
 %{_bindir}/ntk-*