Hello community,

here is the log from the commit of package non-ntk for openSUSE:Factory checked 
in at 2016-06-12 18:55:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/non-ntk (Old)
 and      /work/SRC/openSUSE:Factory/.non-ntk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "non-ntk"

Changes:
--------
New Changes file:

--- /dev/null   2016-04-07 01:36:33.300037506 +0200
+++ /work/SRC/openSUSE:Factory/.non-ntk.new/non-ntk.changes     2016-06-12 
18:55:14.000000000 +0200
@@ -0,0 +1,43 @@
+-------------------------------------------------------------------
+Thu Jun  9 14:46:06 CEST 2016 - ti...@suse.de
+
+- Correct the license again to GPL-2.0+:
+  Some codes in non-ntk are in GPL-2.0+, and this restricts the
+  whole binary although many codes derived from FLTK are in LGPL /
+  SUSE-FLTK.
+
+-------------------------------------------------------------------
+Tue Mar 22 16:37:11 CET 2016 - ti...@suse.de
+
+- Fix license to SUSE-FLTK
+
+-------------------------------------------------------------------
+Sat Feb 13 20:49:34 UTC 2016 - edog...@aon.at
+
+- adapt fedora package to meet openSUSE/OBS conventions
+ 
+-------------------------------------------------------------------
+Tue Sep  3 00:00:00 UTC 2013 - brendan.jones...@gmail.com
+
+- Add exceptions to LGPLv2 license
+- add desktop scriptlet post fluid
+
+-------------------------------------------------------------------
+Mon Sep  2 00:00:00 UTC 2013 - brendan.jones...@gmail.com
+
+- Adjust license
+- Remove icon scriptlets
+- Correct BRs
+
+-------------------------------------------------------------------
+Thu Aug 29 00:00:00 UTC 2013 - brendan.jones...@gmail.com
+
+- Correct license
+- Remove static libraries
+- Correct optflags and BRs
+
+-------------------------------------------------------------------
+Sat Aug 17 00:00:00 UTC 2013 - brendan.jones...@gmail.com
+
+- Initial package
+

New:
----
  non-ntk-1.3.0-fluid.desktop
  non-ntk-1.3.0-fsf.patch
  non-ntk-1.3.0-git5719b00.tar.bz2
  non-ntk-snapshot.sh
  non-ntk-unused-shlib.patch
  non-ntk.changes
  non-ntk.spec

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

Other differences:
------------------
++++++ non-ntk.spec ++++++
#
# spec file for package non-ntk
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# 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/
#
Name:           non-ntk
Version:        1.3.0
Release:        0
Summary:        A fork of FLTK for the non audio suite

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+
License:        GPL-2.0+
URL:            http://non.tuxfamily.org/
Source0:        non-ntk-%{version}-git5719b00.tar.bz2
# script to create source tarball from git
# sh non-snapshot.sh $(rev)
Source1:        non-ntk-snapshot.sh
# no desktop file in tarball
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

%if %{defined fedora}
BuildRequires:  desktop-file-utils
BuildRequires:  python
%endif
%if 0%{?suse_version}
BuildRequires: update-desktop-files
BuildRequires: gcc-c++
%endif
BuildRequires:  cairo-devel
BuildRequires:  libjpeg-devel
BuildRequires:  pkgconfig(libpng)
BuildRequires:  zlib-devel
BuildRequires:  pkgconfig(glu)
BuildRequires:  pkgconfig(xft)

%description
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, 
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}.
Group:          Development/Libraries

%description -n libntk1
This package contains shared libraries for %{name}.

%package devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       libntk1 = %{version}-%{release}

%description devel
This package contains development files for %{name}.

%package fluid
Summary: Fast Light User Interface Designer
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: %{name}-devel

%description fluid
%{summary}, an interactive GUI designer for %{name}.

%prep
%setup -q
%patch1 -p1
%patch2 -p1

sed -i -e "s|append_value('C\(.*\)FLAGS', 
CFLAGS|append_value('C\1FLAGS','%{optflags}'.split(' ')|" \
 wscript

%build
LDFLAGS="%{?__global_ldflags}" ./waf -v configure --prefix=%{_prefix} \
  --libdir=%{_libdir} --enable-gl
./waf -v %{?_smp_mflags} 

%install 
./waf -v install --destdir=%{buildroot}
install -d -m 0755 %{buildroot}%{_datadir}/applications
install -D -m 0644 %{SOURCE2} 
%{buildroot}%{_datadir}/applications/ntk-fluid.desktop
rm %{buildroot}%{_libdir}/libntk*.a*

%if 0%{?suse_version}
 %suse_update_desktop_file -i ntk-fluid Development GUIDesigner
%endif

%post -n libntk1 -p /sbin/ldconfig

%postun -n libntk1 -p /sbin/ldconfig

%postun fluid
update-desktop-database -q &> /dev/null

%post fluid 
update-desktop-database -q &> /dev/null 
 
%check
desktop-file-validate %{buildroot}%{_datadir}/applications/ntk-fluid.desktop

%files
%defattr(-,root,root)
%doc 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
%{_includedir}/ntk
%{_libdir}/pkgconfig/*

%files fluid
%defattr(-,root,root)
%{_datadir}/applications/ntk-fluid.desktop
%{_bindir}/ntk-*

%changelog
++++++ non-ntk-1.3.0-fluid.desktop ++++++
[Desktop Entry]
Name=NTK FLUID
Comment=NTK GUI Designer
Exec=ntk-fluid %F
Terminal=false
Type=Application
MimeType=application/x-fluid;
Categories=Development;GUIDesigner;
++++++ non-ntk-1.3.0-fsf.patch ++++++
++++ 4326 lines (skipped)

++++++ non-ntk-snapshot.sh ++++++
#!/bin/bash

# $1 - revision number to checkout.
: ${1?"You must either provide desired revision number \"X\" to checkout: 
`basename $0` X
                                or fetch the latest revision by: `basename $0` 
HEAD"}

set -e

tmp=$(mktemp -d)

trap cleanup EXIT
cleanup() {
    set +e
    [ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp"
}

unset CDPATH
pwd=$(pwd)
name=non-ntk
version=1.3.0

pushd "$tmp" >/dev/null
echo "Fetching git revision: $1"
git clone git://git.tuxfamily.org/gitroot/non/fltk.git $name-$version |tee 
$name.stdout
cd $name-$version
git reset $1
rm -rf .git* .waf*
cd ..
rm -rf $name.stdout
tar jcf "$pwd"/$name-$version-git$1.tar.bz2 $name-$version
echo "Written: $name-$version-git$1.tar.bz2"
popd >/dev/null
++++++ non-ntk-unused-shlib.patch ++++++
diff -Nurp non-ntk-20130713.orig/wscript non-ntk-20130713.mod/wscript
--- non-ntk-20130713.orig/wscript       2013-07-20 15:40:28.000000000 +0200
+++ non-ntk-20130713.mod/wscript        2013-08-15 08:02:24.439092572 +0200
@@ -28,7 +28,7 @@ out = 'build'
 children = [ 'fluid', 'test' ]
 #children = []
 
-CFLAGS = [ '-pthread',
+CFLAGS = [ 
            '-D_LARGEFILE64_SOURCE',
            '-D_FILE_OFFSET_BITS=64' ]

@@ -218,7 +218,7 @@ def configure(conf):
     print('')
 
 def build(bld):
-
+    bld.env.append_value('LINKFLAGS','-Wl,--as-needed')
     bld.makelib(   source = '''
 src/Fl_Cairo_Graphics_Driver.cxx
 src/Fl.cxx
@@ -408,7 +408,7 @@ src/Fl_Gl_Overlay.cxx
 src/Fl_Gl_Window.cxx
 ''',
             target       = 'ntk_gl',
-            uselib = [ 'X11', 'DL', 'M', 'PTHREAD', 'GL'] )
+            uselib = [ 'X11', 'DL', 'M', 'GL'] )
 
     bld( features = 'subst',
          source = 'ntk.pc.in',
@@ -513,7 +513,7 @@ src/Fl_Gl_Window.cxx
     bld.install_files( bld.env.INCLUDEDIR + '/ntk/FL', start_dir.ant_glob('*.H 
*.h'),
                        cwd=start_dir, relative_trick=True)
 
-    bld.add_post_fun( run_ldconfig )
+    # bld.add_post_fun( run_ldconfig )
 
     #  bld.install_files( string.join( [ '${DATADIR}/doc', APPNAME ], '/' ), 
bld.path.ant_glob( 'doc/*.html doc/*.png' ) )
     

Reply via email to