Hello community, here is the log from the commit of package freeglut for openSUSE:Factory checked in at 2012-02-21 07:30:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/freeglut (Old) and /work/SRC/openSUSE:Factory/.freeglut.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "freeglut", Maintainer is "sndir...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/freeglut/freeglut.changes 2011-10-04 18:09:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.freeglut.new/freeglut.changes 2012-02-21 07:30:38.000000000 +0100 @@ -1,0 +2,25 @@ +Mon Feb 13 14:28:23 UTC 2012 - co...@suse.com + +- fix baselibs.conf for devel-32bit + +------------------------------------------------------------------- +Fri Jan 27 10:10:52 UTC 2012 - sasc...@gmx.de + +- Rename demos package to freeglut-demo to match other demo packages +- Honor shared library policy: + * Rename base package to libglut3 and adjust baselibs.conf accordingly +- Ran spec-cleaner + +------------------------------------------------------------------- +Tue Nov 15 19:06:27 UTC 2011 - johannesoberm...@gmx.de + +- Update to pre-2.8.0 git + * Use a prefixed version (2.7.99) +- Install already built demos + * Add -demos subpackage +- Remove obsolete compat70.tar.bz2 +- glxgears, xdriinfo and glxinfo are part of Mesa-demos-base + * Remove glxdemos.tar.bz2, glxdemos.diff, xdriinfo.tar.bz2 + freeglut-glxgears.notify.diff and freeglut-glxinfo.notify.diff + +------------------------------------------------------------------- Old: ---- compat70.tar.bz2 freeglut-100529.tar.bz2 freeglut-glxgears-notify.diff freeglut-glxinfo-notify.diff glxdemos.diff glxdemos.tar.bz2 xdriinfo-1.0.4.tar.bz2 New: ---- freeglut.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ freeglut.spec ++++++ --- /var/tmp/diff_new_pack.DJytfG/_old 2012-02-21 07:30:40.000000000 +0100 +++ /var/tmp/diff_new_pack.DJytfG/_new 2012-02-21 07:30:40.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package freeglut # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,35 +15,32 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild +%define debug 0 Name: freeglut -BuildRequires: Mesa-devel gcc-c++ libdrm-devel pkgconfig xorg-x11-devel -BuildRequires: libtool +Version: 2.7.99.svn20111107.0422 +Release: 0 Summary: Freely licensed alternative to the GLUT library -Version: 100529 -Release: 2 +License: MIT +Group: System/Libraries Url: http://freeglut.sourceforge.net/ -%define USE_EXTERNAL_MESA 1 -Source0: freeglut-%{version}.tar.bz2 +Source: freeglut.tar.bz2 Source1: glutman.tar.bz2 -Source2: glxdemos.tar.bz2 -Source3: xdriinfo-1.0.4.tar.bz2 -Source4: compat70.tar.bz2 -Source5: baselibs.conf -Patch1: glxdemos.diff -Patch10: freeglut-glxgears-notify.diff -Patch11: freeglut-glxinfo-notify.diff -License: MIT -Provides: mesaglut -Obsoletes: mesaglut +BuildRequires: Mesa-devel +BuildRequires: gcc-c++ +BuildRequires: libdrm-devel +BuildRequires: libtool +BuildRequires: pkgconfig +BuildRequires: xorg-x11-devel +Recommends: Mesa-demos-base +Provides: mesaglut = 7.11 +Obsoletes: mesaglut < 7.11 # bug437293 %ifarch ppc64 Obsoletes: freeglut-64bit %endif # -Group: System/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -57,21 +54,30 @@ containing OpenGL contexts and also read the mouse, keyboard, and joystick functions on a wide range of platforms. +%package -n libglut3 +Summary: Freely licensed alternative to the GLUT library +Group: Development/Libraries/X11 + +%description -n libglut3 +Freeglut is a completely open source alternative to the OpenGL Utility +Toolkit (GLUT) library. GLUT was originally written by Mark Kilgard to +support the sample programs in the second edition OpenGL Redbook. Since +then, GLUT has been used in a wide variety of practical applications +because it is simple, universally available, and highly portable. +GLUT (and freeglut) allow the user to create and manage windows +containing OpenGL contexts and also read the mouse, keyboard, and +joystick functions on a wide range of platforms. -Authors: --------- - Pawel W. Olszta - Andreas Umbach - Steve Baker %package devel -License: MIT Summary: Development libraries, includes and man pages for freeglut (GLUT Library) Group: Development/Libraries/X11 -Requires: %{name} = %{version}-%{release} xorg-x11-Mesa-devel xorg-x11-devel -Provides: mesaglut-devel -Obsoletes: mesaglut-devel +Requires: libglut3 = %{version} +Requires: xorg-x11-Mesa-devel +Requires: xorg-x11-devel +Provides: mesaglut-devel = 7.11 +Obsoletes: mesaglut-devel < 7.11 # bug437293 %ifarch ppc64 Obsoletes: freeglut-devel-64bit @@ -85,7 +91,7 @@ In addition, it also includes manual pages which describe all functions provided by the freeglut library. -freeglut is a completely open source alternative to the OpenGL Utility +Freeglut is a completely open source alternative to the OpenGL Utility Toolkit (GLUT) library. GLUT was originally written by Mark Kilgard to support the sample programs in the second edition OpenGL Redbook. Since then, GLUT has been used in a wide variety of practical applications @@ -95,101 +101,72 @@ containing OpenGL contexts and also read the mouse, keyboard, and joystick functions on a wide range of platforms. +%package demo +Summary: Demonstration applications for the freeglut library +Group: System/X11/Utilities +%description demo +This package contains demonstration applications for the freeglut library. + +Freeglut is a completely open source alternative to the OpenGL Utility +Toolkit (GLUT) library. GLUT was originally written by Mark Kilgard to +support the sample programs in the second edition OpenGL Redbook. Since +then, GLUT has been used in a wide variety of practical applications +because it is simple, universally available, and highly portable. + +GLUT (and freeglut) allow the user to create and manage windows +containing OpenGL contexts and also read the mouse, keyboard, and +joystick functions on a wide range of platforms. %prep -%setup -q -b1 -b2 -b3 -b4 -n freeglut -%if %USE_EXTERNAL_MESA -pushd .. -%patch1 -# Change lib -> %_lib -if [ "%_lib" != lib ] ; then - for f in `find usr/ \! -wholename '*/include/*' -type f -print` ; do - sed -i 's|/lib/|/%_lib/|g;s|/lib$|/%_lib|' "$f" - done - for f in `find usr/ -wholename '*/lib/*' -type f -print` ; do - d="`echo "$f" | sed 's|/lib|/%_lib|g'`" - mkdir -p "`dirname "$d"`" - mv "$f" "$d" - done - find usr -type d -print | xargs rmdir 2>/dev/null || true -fi -popd -%endif -pushd ../glxgears -%patch10 -p1 -popd -pushd ../glxinfo -%patch11 -p1 -popd +%setup -q -b0 -b1 -n freeglut %build -autoreconf -fi -%configure --disable-static --with-pic -make %{?jobs:-j%jobs} -%if %USE_EXTERNAL_MESA -pushd .. - for i in glxinfo glxgears; do - pushd $i; xmkmf -a; make %{?jobs:-j%jobs} CDEBUGFLAGS="$RPM_OPT_FLAGS"; popd - done - pushd xdriinfo-* - test -f /usr/%_lib/pkgconfig/x11.pc || \ - export PKG_CONFIG_PATH=/usr/%_lib/pkgconfig:$RPM_BUILD_DIR/usr/%_lib/pkgconfig - %configure --disable-static --with-pic - make %{?jobs:-j%jobs} - popd -popd +./autogen.sh +%configure \ + --enable-replace-glut \ +%if %debug + --enable-debug \ %endif + --disable-static +make %{?_smp_mflags} %install -%makeinstall -# remove demos -rm -f ${RPM_BUILD_ROOT}/usr/bin/{fractals*,lorenz,one} +%make_install +# install demo files +install -d %{buildroot}%{_libexecdir}/freeglut +for i in shapes smooth_opengl3 spaceball subwin CallbackMaker; do + install progs/demos/$i/.libs/$i %{buildroot}%{_libexecdir}/freeglut/$i +done +install progs/demos/Fractals/.libs/fractals %{buildroot}%{_libexecdir}/freeglut/fractals +install progs/demos/Fractals_random/.libs/fractals_random %{buildroot}%{_libexecdir}/freeglut/fractals_random +install progs/demos/One/.libs/one %{buildroot}%{_libexecdir}/freeglut/one +install progs/demos/Lorenz/.libs/lorenz %{buildroot}%{_libexecdir}/freeglut/lorenz # glut Manual Pages -mkdir -p ${RPM_BUILD_ROOT}/%{_mandir}/man3 -pushd ../glut-3.7 - for i in man/glut/glut*; do - install -m 644 $i ${RPM_BUILD_ROOT}/%{_mandir}/man3/`basename $i man`3 - done -popd -%if %USE_EXTERNAL_MESA -pushd .. - for i in glxinfo glxgears; do - pushd $i - make install DESTDIR=$RPM_BUILD_ROOT BINDIR=/usr/bin - make install.man DESTDIR=$RPM_BUILD_ROOT MANDIR=%_mandir/man1 - popd - done - pushd xdriinfo-* - make install DESTDIR=$RPM_BUILD_ROOT - popd -popd -%endif -%{__rm} -f %{buildroot}%{_libdir}/*.la +mkdir -p %{buildroot}/%{_mandir}/man3 +for i in ../glut-3.7/man/glut/glut*; do + install -m 644 $i %{buildroot}/%{_mandir}/man3/`basename $i man`3 +done +rm -rf %{buildroot}%{_libdir}/libglut.la -%post -p /sbin/ldconfig +%post -n libglut3 -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%postun -n libglut3 -p /sbin/ldconfig -%clean -rm -rf $RPM_BUILD_ROOT - -%files +%files -n libglut3 %defattr(-,root,root) -%if %USE_EXTERNAL_MESA -/usr/bin/glxgears -/usr/bin/glxinfo -/usr/bin/xdriinfo -%{_mandir}/man1/glxgears.1x.gz -%{_mandir}/man1/glxinfo.1x.gz -%{_mandir}/man1/xdriinfo.1.gz -%endif +%doc AUTHORS COPYING NEWS README %{_libdir}/libglut.so.* %files devel %defattr(-,root,root) -%{_includedir}/GL/* +%doc ChangeLog +%{_includedir}/GL %{_libdir}/libglut.so %{_mandir}/man3/* +%files demo +%defattr(-,root,root) +%{_libexecdir}/freeglut + %changelog ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.DJytfG/_old 2012-02-21 07:30:40.000000000 +0100 +++ /var/tmp/diff_new_pack.DJytfG/_new 2012-02-21 07:30:40.000000000 +0100 @@ -1,2 +1,5 @@ -freeglut +libglut3 freeglut-devel + requires -freeglut-<targettype> + requires "libglut3-<targettype> = <version>" + ++++++ freeglut-100529.tar.bz2 -> freeglut.tar.bz2 ++++++ ++++ 92658 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
