Hello community, here is the log from the commit of package freeglut for openSUSE:Factory checked in at 2015-03-16 06:53:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/freeglut (Old) and /work/SRC/openSUSE:Factory/.freeglut.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "freeglut" Changes: -------- --- /work/SRC/openSUSE:Factory/freeglut/freeglut.changes 2014-09-20 07:26:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.freeglut.new/freeglut.changes 2015-03-16 06:53:43.000000000 +0100 @@ -1,0 +2,16 @@ +Fri Mar 13 13:12:11 UTC 2015 - tchva...@suse.com + +- Version bump to 3.0.0 + * Now with cmake build system + * Various small fixes around here and there - no upstream changelog + apart from VCS +- Remove some more obsolete things from spec now when we use cmake + +------------------------------------------------------------------- +Fri Mar 13 12:56:54 UTC 2015 - tchva...@suse.com + +- Cleanup with spec-cleaner a bit +- Remove obsolete conditions +- Remove condition for sle11 build as it fails anyway + +------------------------------------------------------------------- Old: ---- freeglut-2.8.1.tar.gz New: ---- freeglut-3.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ freeglut.spec ++++++ --- /var/tmp/diff_new_pack.7hlm6w/_old 2015-03-16 06:53:44.000000000 +0100 +++ /var/tmp/diff_new_pack.7hlm6w/_new 2015-03-16 06:53:44.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package freeglut # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -16,10 +16,9 @@ # -%define debug 0 - +%define _libname libglut3 Name: freeglut -Version: 2.8.1 +Version: 3.0.0 Release: 0 Summary: Freely licensed alternative to the GLUT library License: MIT @@ -28,8 +27,8 @@ Source: https://downloads.sourceforge.net/project/freeglut/%{name}/%{version}/%{name}-%{version}.tar.gz Source1: glutman.tar.bz2 Source2: baselibs.conf +BuildRequires: cmake BuildRequires: gcc-c++ -BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(glu) @@ -40,11 +39,6 @@ Recommends: Mesa-demo-x Provides: mesaglut = 7.11 Obsoletes: mesaglut < 7.11 -# bug437293 -%ifarch ppc64 -Obsoletes: freeglut-64bit -%endif -# BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -58,11 +52,11 @@ containing OpenGL contexts and also read the mouse, keyboard, and joystick functions on a wide range of platforms. -%package -n libglut3 +%package -n %_libname Summary: Freely licensed alternative to the GLUT library Group: Development/Libraries/X11 -%description -n libglut3 +%description -n %_libname 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 @@ -73,24 +67,14 @@ containing OpenGL contexts and also read the mouse, keyboard, and joystick functions on a wide range of platforms. - %package devel Summary: Development libraries, includes and man pages for freeglut (GLUT Library) Group: Development/Libraries/X11 -Requires: libglut3 = %{version} -%if 0%{?suse_version} >= 1220 +Requires: %_libname = %{version} Requires: pkgconfig(gl) Requires: pkgconfig(glu) -%else -Requires: xorg-x11-Mesa-devel -%endif Provides: mesaglut-devel = 7.11 Obsoletes: mesaglut-devel < 7.11 -# bug437293 -%ifarch ppc64 -Obsoletes: freeglut-devel-64bit -%endif -# %description devel This package contains all necessary include files and libraries needed @@ -127,50 +111,44 @@ joystick functions on a wide range of platforms. %prep -%setup -q -b0 -b1 -n %{name}-%{version} +%setup -q -b0 -b1 %build -./autogen.sh -%configure \ - --enable-replace-glut \ -%if %debug - --enable-debug \ -%endif - --disable-static +%cmake \ + -DFREEGLUT_BUILD_STATIC_LIBS=OFF make %{?_smp_mflags} %install -make install DESTDIR="%buildroot" +%cmake_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 +pushd build/bin/ > /dev/null +for i in *; do + install $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 +popd > /dev/null + +# old glut Manual Pages 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 -n libglut3 -p /sbin/ldconfig +%post -n %_libname -p /sbin/ldconfig -%postun -n libglut3 -p /sbin/ldconfig +%postun -n %_libname -p /sbin/ldconfig -%files -n libglut3 +%files -n %_libname %defattr(-,root,root) -%doc AUTHORS COPYING NEWS README +%doc AUTHORS COPYING README %{_libdir}/libglut.so.* %files devel %defattr(-,root,root) -%doc ChangeLog %{_includedir}/GL %{_libdir}/libglut.so +%{_libdir}/pkgconfig/freeglut.pc %{_mandir}/man3/* %files demo ++++++ freeglut-2.8.1.tar.gz -> freeglut-3.0.0.tar.gz ++++++ ++++ 172650 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
