Hello community, here is the log from the commit of package fltk for openSUSE:Factory checked in at Fri Dec 4 11:38:38 CET 2009. -------- --- fltk/fltk.changes 2009-08-04 16:07:38.000000000 +0200 +++ /mounts/work_src_done/STABLE/fltk/fltk.changes 2009-12-01 14:45:46.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Dec 1 13:32:31 CET 2009 - pgajdos@suse.cz + +- update to version 1.1.10rc3 +- splitted out libfltk1 +- some specfile cleanups + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- fltk-1.1.9-as_needed.patch fltk-1.1.9-cast.patch fltk-1.1.9-intptr_t.patch fltk-1.1.9-libdir.patch fltk-1.1.9-link_gl.patch fltk-1.1.9-source.tar.bz2 New: ---- fltk-1.1.9.9-as_needed.patch fltk-1.1.9.9-cast.patch fltk-1.1.9.9-intptr_t.patch fltk-1.1.9.9-libdir.patch fltk-1.1.9.9-link_gl.patch fltk-1.1.9.9-source.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fltk.spec ++++++ --- /var/tmp/diff_new_pack.eznQba/_old 2009-12-04 11:37:22.000000000 +0100 +++ /var/tmp/diff_new_pack.eznQba/_new 2009-12-04 11:37:22.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package fltk (Version 1.1.9) +# spec file for package fltk (Version 1.1.9.9) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,17 +19,16 @@ Name: fltk -# Build Requires: freeglut-devel gcc-c++ libdrm-devel libjpeg-devel libpng-devel libxml2 BuildRequires: Mesa-devel gcc-c++ libjpeg-devel libpng-devel xorg-x11-devel -License: LGPL v2.1 or later +License: LGPLv2.1+ Group: Development/Libraries/X11 AutoReqProv: on -# some of files were updated from CinePaint CVS: -# http://cinepaint.cvs.sourceforge.net/cinepaint/cinepaint-project/fltk/ -Version: 1.1.9 -Release: 35 +Version: 1.1.9.9 +Release: 1 Summary: Free C++ GUI Toolkit for the X Window System, OpenGL, and WIN32 Url: http://www.fltk.org/ +# some of files were updated from CinePaint CVS: +# http://cinepaint.cvs.sourceforge.net/cinepaint/cinepaint-project/fltk/ Source: %{name}-%{version}-source.tar.bz2 Patch1: %{name}-delete-fix.patch Patch2: %{name}-%{version}-intptr_t.patch @@ -39,30 +38,23 @@ Patch5: %{name}-%{version}-as_needed.patch Patch6: %{name}-%{version}-link_gl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires: libfltk1 >= %{version} + +%description +The Fast Light Tool Kit ("FLTK", pronounced "fulltick") is a C++ +graphical user interface toolkit for the X Window System (UNIX(r)), +OpenGL(r), and Microsoft(r) Windows(r) NT 4.0, 95, or 98. The +installation of this package requires you to install a 3D library. If +you do not have hardware 3D, you can use the software OpenGL library in +the mesasoft package (series x3d). The library can be recompiled +without 3D support. %package devel -License: LGPL v2.1 or later -Summary: Include Files and Libraries mandatory for Development. +License: LGPLv2.1+ +Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/C and C++ -Requires: %{name} = %{version} +Requires: libfltk1 = %{version} AutoReqProv: on -%if "%(xft-config --prefix)" == "/usr" -%define _xorg7libs %_lib -%define _xorg7bin bin -%define _xorg7_mandir %_mandir -%define _xorg7pixmaps include -%define _xorg7libshare share -#%define _xorg7_config /usr/share/X11/config #use libshare macro -%define _xorg7_prefix /usr -%else -%define _xorg7libs X11R6/%_lib -%define _xorg7bin X11R6/bin -%define _xorg7_mandir /usr/X11R6/man -%define _xorg7pixmaps X11R6/include -%define _xorg7libshare X11R6/lib/ -#%define _xorg7_config /usr/X11R6/lib/X11/config #use libshare macro -%define _xorg7_prefix /usr/X11R6 -%endif %description devel The Fast Light Tool Kit ("FLTK", pronounced "fulltick") is a C++ @@ -73,9 +65,13 @@ mesasoft package (series x3d). The library can be recompiled without 3D support. +%package -n libfltk1 +License: LGPLv2.1+ +Summary: FLTK Library +Group: Development/Libraries/C and C++ +AutoReqProv: on - -%description +%description -n libfltk1 The Fast Light Tool Kit ("FLTK", pronounced "fulltick") is a C++ graphical user interface toolkit for the X Window System (UNIX(r)), OpenGL(r), and Microsoft(r) Windows(r) NT 4.0, 95, or 98. The @@ -87,7 +83,7 @@ %prep -%setup -q +%setup -q -n fltk-1.1.10rc3 %patch1 %patch2 %if "%{_lib}" == "lib64" @@ -103,29 +99,29 @@ %{?suse_update_config:%{suse_update_config}} ./configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ - --prefix=%{_xorg7_prefix} \ - --bindir=%{_xorg7_prefix}/bin \ - --libdir=%{_xorg7_prefix}/%{_lib} \ - --includedir=%{_xorg7_prefix}/include \ + --prefix=%{_prefix} \ + --bindir=%{_bindir} \ + --libdir=%{_libdir} \ + --includedir=%{_includedir} \ --enable-shared --enable-threads -make glflags="-L/usr/%{_lib}/ -lGL" \ - fltkflags="-L%{_xorg7_prefix}/%{_lib}/ -lfltk" +make glflags="-L%{_libdir} -lGL" \ + fltkflags="-L%{_libdir} -lfltk" %install -make install libdir=${RPM_BUILD_ROOT}%{_xorg7_prefix}/%{_lib}/ \ - includedir=${RPM_BUILD_ROOT}%{_xorg7_prefix}/include \ - bindir=${RPM_BUILD_ROOT}%{_xorg7_prefix}/bin/ \ +make install libdir=${RPM_BUILD_ROOT}%{_libdir}/ \ + includedir=${RPM_BUILD_ROOT}%{_includedir} \ + bindir=${RPM_BUILD_ROOT}%{_bindir} \ docdir=${RPM_BUILD_ROOT}/%{_docdir}/fltk \ - mandir=${RPM_BUILD_ROOT}%{_xorg7_mandir} STRIP=true -rm -rf ${RPM_BUILD_ROOT}%{_xorg7_mandir}/cat* + mandir=${RPM_BUILD_ROOT}%{_mandir} STRIP=true +rm -rf ${RPM_BUILD_ROOT}%{_mandir}/cat* rm -r test -cp -a CHANGES COPYING README ${RPM_BUILD_ROOT}%{_docdir}/fltk/ -cp makeinclude ${RPM_BUILD_ROOT}/usr/share/doc/packages/fltk -chmod a-x ${RPM_BUILD_ROOT}%{_libdir}/libfltk*.a +cp -a CHANGES COPYING README ${RPM_BUILD_ROOT}%{_docdir}/%{name} +cp makeinclude ${RPM_BUILD_ROOT}%{_docdir}/%{name} +rm ${RPM_BUILD_ROOT}%{_libdir}/libfltk*.a -%post -p /sbin/ldconfig +%post -n libfltk1 -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%postun -n libfltk1 -p /sbin/ldconfig %clean rm -rf $RPM_BUILD_ROOT @@ -136,7 +132,6 @@ %doc %{_docdir}/fltk/CHANGES %doc %{_docdir}/fltk/COPYING %doc %{_docdir}/fltk/README -%{_xorg7_prefix}/%{_lib}/*.so.* %files devel %defattr(-,root,root) @@ -146,10 +141,13 @@ %doc %{_docdir}/fltk/*.jpg %doc %{_docdir}/fltk/*.html %doc %{_docdir}/fltk/makeinclude -%doc %{_xorg7_mandir}/man*/* -%{_xorg7_prefix}/%{_lib}/*.a -%{_xorg7_prefix}/%{_lib}/*.so -%{_xorg7_prefix}/include/* -%{_xorg7_prefix}/bin/* +%doc %{_mandir}/man*/* +%{_libdir}/*.so +%{_includedir}/* +%{_bindir}/* + +%files -n libfltk1 +%defattr(-,root,root) +%{_libdir}/*.so.* %changelog ++++++ fltk-1.1.9-as_needed.patch -> fltk-1.1.9.9-as_needed.patch ++++++ ++++++ fltk-1.1.9-cast.patch -> fltk-1.1.9.9-cast.patch ++++++ ++++++ fltk-1.1.9-intptr_t.patch -> fltk-1.1.9.9-intptr_t.patch ++++++ ++++++ fltk-1.1.9-libdir.patch -> fltk-1.1.9.9-libdir.patch ++++++ --- fltk/fltk-1.1.9-libdir.patch 2008-07-08 16:55:58.000000000 +0200 +++ /mounts/work_src_done/STABLE/fltk/fltk-1.1.9.9-libdir.patch 2009-12-01 14:45:43.000000000 +0100 @@ -1,6 +1,8 @@ ---- configure.in +Index: configure.in +=================================================================== +--- configure.in.orig +++ configure.in -@@ -78,17 +78,17 @@ +@@ -99,17 +99,17 @@ case $uname in esac dnl Define the libraries and link options we'll need. @@ -24,9 +26,9 @@ +GLLIBNAME="../lib64/libfltk_gl.a" +IMGLIBNAME="../lib64/libfltk_images.a" - AC_SUBST(FLLIBNAME) - AC_SUBST(GLDEMOS) -@@ -220,7 +220,7 @@ + LIBBASENAME="libfltk.a" + FLLIBBASENAME="libfltk_forms.a" +@@ -259,7 +259,7 @@ else PICFLAG=0 SHAREDSUFFIX="" FLUID="fluid" @@ -35,72 +37,3 @@ fi AC_SUBST(DSOCOMMAND) ---- fluid/Makefile -+++ fluid/Makefile -@@ -54,8 +54,8 @@ - - all: $(FLUID) fluid$(EXEEXT) - --fluid$(EXEEXT): $(OBJECTS) ../lib/$(LIBNAME) ../lib/$(FLLIBNAME) \ -- ../lib/$(IMGLIBNAME) -+fluid$(EXEEXT): $(OBJECTS) $(LIBNAME) $(FLLIBNAME) \ -+ $(IMGLIBNAME) - echo Linking $@... - $(CXX) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDLIBS) - $(POSTBUILD) $@ ../FL/mac.r ---- test/Makefile -+++ test/Makefile -@@ -233,7 +233,7 @@ - ../fluid/fluid$(EXEEXT) -c $< - - # All demos depend on the FLTK library... --$(ALL): ../lib/$(LIBNAME) -+$(ALL): $(LIBNAME) - - # General demos... - unittests$(EXEEXT): unittests.o -@@ -288,7 +288,7 @@ - fast_slow$(EXEEXT): fast_slow.o - fast_slow.cxx: fast_slow.fl - --file_chooser$(EXEEXT): file_chooser.o ../lib/$(IMGLIBNAME) -+file_chooser$(EXEEXT): file_chooser.o $(IMGLIBNAME) - echo Linking $@... - $(CXX) -I.. $(CXXFLAGS) file_chooser.o -o $@ $(LINKFLTKIMG) $(LDLIBS) - $(POSTBUILD) $@ ../FL/mac.r -@@ -302,7 +302,7 @@ - - hello$(EXEEXT): hello.o - --help$(EXEEXT): help.o ../lib/$(IMGLIBNAME) -+help$(EXEEXT): help.o $(IMGLIBNAME) - echo Linking $@... - $(CXX) -I.. $(CXXFLAGS) help.o -o $@ $(LINKFLTKIMG) $(LDLIBS) - $(POSTBUILD) $@ ../FL/mac.r -@@ -349,7 +349,7 @@ - - navigation$(EXEEXT): navigation.o - --output$(EXEEXT): output.o ../lib/$(FLLIBNAME) -+output$(EXEEXT): output.o $(FLLIBNAME) - echo Linking $@... - $(CXX) -I.. $(CXXFLAGS) -o $@ output.o $(LINKFLTKFORMS) $(LDLIBS) - $(POSTBUILD) $@ ../FL/mac.r -@@ -360,7 +360,7 @@ - - pixmap$(EXEEXT): pixmap.o - --pixmap_browser$(EXEEXT): pixmap_browser.o ../lib/$(IMGLIBNAME) -+pixmap_browser$(EXEEXT): pixmap_browser.o $(IMGLIBNAME) - echo Linking $@... - $(CXX) -I.. $(CXXFLAGS) pixmap_browser.o -o $@ $(LINKFLTKIMG) $(LDLIBS) - $(POSTBUILD) $@ ../FL/mac.r -@@ -409,7 +409,7 @@ - valuators.cxx: valuators.fl - - # All OpenGL demos depend on the FLTK and FLTK_GL libraries... --$(GLALL): ../lib/$(LIBNAME) ../lib/$(GLLIBNAME) -+$(GLALL): $(LIBNAME) $(GLLIBNAME) - - # OpenGL demos... - CubeView$(EXEEXT): CubeMain.o CubeView.o CubeViewUI.o ++++++ fltk-1.1.9-link_gl.patch -> fltk-1.1.9.9-link_gl.patch ++++++ ++++++ fltk-1.1.9-source.tar.bz2 -> fltk-1.1.9.9-source.tar.bz2 ++++++ ++++ 24201 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org