Hello community, here is the log from the commit of package sfml for openSUSE:Factory checked in at 2015-04-02 16:04:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sfml (Old) and /work/SRC/openSUSE:Factory/.sfml.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sfml" Changes: -------- --- /work/SRC/openSUSE:Factory/sfml/sfml.changes 2013-04-23 15:20:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sfml.new/sfml.changes 2015-04-02 16:04:24.000000000 +0200 @@ -1,0 +2,25 @@ +Wed Apr 1 13:42:34 UTC 2015 - meissner@suse.com + +- fixed -devel requires + +------------------------------------------------------------------- +Mon Mar 23 03:31:09 UTC 2015 - p.drouand@gmail.com + +- Update to version 2.2 + * A lot of things to list; please go to + http://www.sfml-dev.org/changelog.php#sfml-2.2 +- Remove obsolete patches + * sfml-1.6-nochm.patch + * sfml-1.6-cflags.patch + * sfml-1.6-gcc.patch + * sfml-1.6-system_libs.patch + * sfml-1.6-underlinking.patch + * sfml-1.6-png.patch + * sfml-memcpy.patch +- Use download Url as source +- Add unzip build require +- Upstream moved to cmake + * Add cmake build require + * Use %cmake macro + +------------------------------------------------------------------- Old: ---- sfml-1.6-cflags.patch sfml-1.6-gcc.patch sfml-1.6-nochm.patch sfml-1.6-png.patch sfml-1.6-system_libs.patch sfml-1.6-underlinking.patch sfml-1.6.tar.gz sfml-memcpy.patch New: ---- SFML-2.2-sources.zip ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sfml.spec ++++++ --- /var/tmp/diff_new_pack.8MwOnR/_old 2015-04-02 16:04:25.000000000 +0200 +++ /var/tmp/diff_new_pack.8MwOnR/_new 2015-04-02 16:04:25.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package sfml # -# Copyright (c) 2013 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,30 +16,17 @@ # -%define soname 1_6 +%define soname 2_2 Name: sfml -Version: 1.6 +Version: 2.2 Release: 0 Summary: Simple and Fast Multimedia Library License: Zlib and SUSE-Public-Domain Group: Development/Libraries/C and C++ Url: http://www.sfml-dev.org/ -Source: sfml-%{version}.tar.gz -# PATCH-FIX-UPSTREAM -Patch0: sfml-1.6-nochm.patch -# PATCH-FIX-UPSTREAM -Patch1: sfml-1.6-cflags.patch -# PATCH-FIX-UPSTREAM -Patch2: sfml-1.6-gcc.patch -# PATCH-FIX-UPSTREAM -Patch3: sfml-1.6-system_libs.patch -# PATCH-FIX-UPSTREAM -Patch4: sfml-1.6-underlinking.patch -# PATCH-FIX-UPSTREAM -Patch5: sfml-1.6-png.patch -# PATCH-FIX-UPSTREAM -Patch6: sfml-memcpy.patch +Source: http://www.sfml-dev.org/files/SFML-%{version}-sources.zip BuildRequires: Mesa-devel +BuildRequires: cmake BuildRequires: doxygen BuildRequires: freetype2-devel BuildRequires: gcc-c++ @@ -56,6 +43,7 @@ BuildRequires: libsndfile-devel BuildRequires: libtool BuildRequires: openal-soft-devel +BuildRequires: unzip BuildRequires: xorg-x11-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -81,27 +69,13 @@ Summary: SFML development files Group: Development/Libraries/C and C++ Requires: Mesa-devel -Requires: libsfml1_6 = %{version} +Requires: lib%{name}%{soname} = %{version} %description devel Development files for SFML. %prep -%setup -q -n sfml-%{version} -%patch0 -%patch1 -%patch2 -%patch3 -%patch4 -%patch5 -p1 -%patch6 -p1 - -rm -rf src/SFML/Graphics/GLEW -rm -rf src/SFML/Graphics/libjpeg -rm -rf src/SFML/Graphics/libpng -rm -rf src/SFML/Graphics/SOIL -rm -rf src/SFML/Graphics/zlib -rm -rf src/SFML/Window/glext +%setup -q -n SFML-%{version} # fix line endings find . -type f -not \( -name \*.gif -o -name \*.jpg -o -name \*.png -o -name \*.ttf -o -name \*.wav \) -exec sed -i "s|\r||" {} \; @@ -110,12 +84,15 @@ find . -type f -exec chmod -x {} \; %build -make %{?_smp_mflags} DEBUGFLAGS="%{optflags} -DNDEBUG" -cd doc/build -doxygen +%cmake -DSFML_BUILD_DOC=ON +make %{?_smp_mflags} %install -make DESTDIR=%{buildroot}/usr DESTLIBDIR=%{buildroot}%{_libdir} install +#make DESTDIR=%{buildroot}/usr DESTLIBDIR=%{buildroot}%{_libdir} install +cd build +%make_install +# Remove documentation installed in wrong directory +rm -rf %{buildroot}%{_datadir}/SFML %post -n lib%{name}%{soname} -p /sbin/ldconfig %postun -n lib%{name}%{soname} -p /sbin/ldconfig @@ -127,7 +104,7 @@ %files devel %defattr(-,root,root) -%doc doc/*.htm doc/html +%doc build/doc/html/* %{_includedir}/SFML %{_libdir}/lib*.so