Hello community, here is the log from the commit of package fltk for openSUSE:Factory checked in at 2017-07-30 11:24:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fltk (Old) and /work/SRC/openSUSE:Factory/.fltk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fltk" Sun Jul 30 11:24:49 2017 rev:38 rq:510970 version:1.3.4 Changes: -------- --- /work/SRC/openSUSE:Factory/fltk/fltk.changes 2017-02-16 16:42:14.105965652 +0100 +++ /work/SRC/openSUSE:Factory/.fltk.new/fltk.changes 2017-07-30 11:24:50.406898737 +0200 @@ -1,0 +2,7 @@ +Mon Jul 17 12:34:53 UTC 2017 - tchva...@suse.com + +- Drop patch fltk-1.3.2-do_not_add_unneeded_extra_dependencies.patch + as upstream closed the ticked stating it is wrong +- Add patch fltk-1.3.4-fltk_config.patch + +------------------------------------------------------------------- Old: ---- fltk-1.3.2-do_not_add_unneeded_extra_dependencies.patch New: ---- fltk-1.3.4-fltk_config.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fltk.spec ++++++ --- /var/tmp/diff_new_pack.zwqi6q/_old 2017-07-30 11:24:51.242780787 +0200 +++ /var/tmp/diff_new_pack.zwqi6q/_new 2017-07-30 11:24:51.246780223 +0200 @@ -17,7 +17,6 @@ Name: fltk -# Migrating Code from FLTK 1.1 to 1.3: http://www.fltk.org/doc-1.3/migration_1_3.html Version: 1.3.4 Release: 0 Summary: Free C++ GUI Toolkit for the X Window System, OpenGL, and WIN32 @@ -26,11 +25,10 @@ Url: http://www.fltk.org/ Source: http://fltk.org/pub/fltk/%{version}/fltk-%{version}-source.tar.gz Source2: baselibs.conf -# PATCH-FIX-UPSTREAM fltk-1.3.2-do_not_add_unneeded_extra_dependencies.patch http://www.fltk.org/str.php?L2918 reddw...@opensuse.org -- Don't ask dependent libraries to link against Xft without need. Broke games/toycars. -Patch0: fltk-1.3.2-do_not_add_unneeded_extra_dependencies.patch +# PATCH-FIX-UPSTREAM fltk-1.3.4-fltk_config.patch tchva...@suse.com -- obey libdir and other options in fltk-config taken from Fedora +Patch0: fltk-1.3.4-fltk_config.patch # PATCH-FIX-OPENSUSE fltk-1.3.2-verbose_build.patch reddw...@opensuse.org -- Make the build verbose so the post build checks can verify the CFLAGS Patch2: fltk-1.3.2-verbose_build.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: doxygen BuildRequires: gcc-c++ BuildRequires: libjpeg-devel @@ -56,9 +54,9 @@ Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/C and C++ Requires: libfltk1 = %{version} -Provides: fltk = %{version} Requires: pkgconfig(gl) Requires: pkgconfig(x11) +Provides: fltk = %{version} %description devel The Fast Light Tool Kit ("FLTK", pronounced "fulltick") is a C++ @@ -100,31 +98,29 @@ %prep %setup -q -%patch0 +%patch0 -p1 %patch2 %build %configure \ - --enable-shared --enable-threads + --enable-shared \ + --enable-threads make %{?_smp_mflags} cd documentation make html %{?_smp_mflags} %install -make install libdir=${RPM_BUILD_ROOT}%{_libdir}/ \ - includedir=${RPM_BUILD_ROOT}%{_includedir} \ - bindir=${RPM_BUILD_ROOT}%{_bindir} \ - docdir=${RPM_BUILD_ROOT}/%{_docdir}/fltk-devel/html/ \ - mandir=${RPM_BUILD_ROOT}%{_mandir} STRIP=true -rm -r ${RPM_BUILD_ROOT}%{_mandir}/cat* -# rm ${RPM_BUILD_ROOT}%{_libdir}/libfltk*.a +make install libdir=%{buildroot}%{_libdir}/ \ + includedir=%{buildroot}%{_includedir} \ + bindir=%{buildroot}%{_bindir} \ + docdir=%{buildroot}/%{_docdir}/fltk-devel/html/ \ + mandir=%{buildroot}%{_mandir} STRIP=true +rm -r %{buildroot}%{_mandir}/cat* %post -n libfltk1 -p /sbin/ldconfig - %postun -n libfltk1 -p /sbin/ldconfig %files devel -%defattr(-,root,root) %doc examples makeinclude %doc %{_docdir}/fltk-devel %{_mandir}/man*/* @@ -133,12 +129,10 @@ %{_bindir}/* %files -n libfltk1 -%defattr(-,root,root) %doc CHANGES COPYING README %{_libdir}/*.so.* %files devel-static -%defattr(0644,root,root) %{_libdir}/libfltk*.a %changelog ++++++ fltk-1.3.4-fltk_config.patch ++++++ diff -up fltk-1.3.4-1/fltk-config.in.fltk_config fltk-1.3.4-1/fltk-config.in --- fltk-1.3.4-1/fltk-config.in.fltk_config 2016-01-30 20:49:56.000000000 -0600 +++ fltk-1.3.4-1/fltk-config.in 2017-03-04 12:29:28.910316677 -0600 @@ -44,8 +44,8 @@ CXX="@CXX@" # flags for C++ compiler: ARCHFLAGS="@ARCHFLAGS@" -CFLAGS="@CFLAGS@ @LARGEFILE@ @PTHREAD_FLAGS@" -CXXFLAGS="@CXXFLAGS@ @LARGEFILE@ @PTHREAD_FLAGS@" +CFLAGS="" +CXXFLAGS="" LDFLAGS="@LDFLAGS@" LDLIBS="@LIBS@" OPTIM="@OPTIM@" @@ -228,7 +228,7 @@ if test "$BINARY_DIR" != ""; then includes="-I$BINARY_DIR $includes" fi -if test "$libdir" != /usr/lib -a "$libdir" != /usr/lib32; then +if test "$libdir" != /usr/lib -a "$libdir" != /usr/lib32 -a "$libdir" != /usr/lib64; then libs=-L$libdir else libs= @@ -236,28 +236,28 @@ fi # Calculate needed libraries LDSTATIC="$libdir/libfltk.a $LDLIBS" -LDLIBS="-lfltk$SHAREDSUFFIX $LDLIBS" +LDLIBS="-lfltk$SHAREDSUFFIX" if test x$use_forms = xyes; then LDLIBS="-lfltk_forms$SHAREDSUFFIX $LDLIBS" LDSTATIC="$libdir/libfltk_forms.a $LDSTATIC" fi if test x$use_gl = xyes; then - LDLIBS="-lfltk_gl$SHAREDSUFFIX @GLLIB@ $LDLIBS" + LDLIBS="-lfltk_gl$SHAREDSUFFIX $LDLIBS" LDSTATIC="$libdir/libfltk_gl.a @GLLIB@ $LDSTATIC" fi if test x$use_images = xyes; then - LDLIBS="-lfltk_images$SHAREDSUFFIX $IMAGELIBS $LDLIBS" + LDLIBS="-lfltk_images$SHAREDSUFFIX $LDLIBS" LDSTATIC="$libdir/libfltk_images.a $STATICIMAGELIBS $LDSTATIC" fi if test x$use_cairo = xyes; then - LDLIBS="-lfltk_cairo$SHAREDSUFFIX $CAIROLIBS $LDLIBS" + LDLIBS="-lfltk_cairo$SHAREDSUFFIX $LDLIBS" LDSTATIC="$libdir/libfltk_cairo.a $CAIROLIBS $LDSTATIC" fi -LDLIBS="$DSOLINK $LDFLAGS $libs $LDLIBS" -LDSTATIC="$LDFLAGS $LDSTATIC" +LDLIBS="$libs $LDLIBS" +#LDSTATIC="$LDFLAGS $LDSTATIC" # Answer to user requests if test -n "$echo_help"; then
