[SFML] Updated to 2.0

belegdol belegdol at fedoraproject.org
Mon May 6 05:45:30 UTC 2013


commit 11ba771fc50e5c24bd161dff46200eb0f58dd53d
Author: Julian Sikorski <belegdol at fedoraproject.org>
Date:   Mon May 6 07:43:59 2013 +0200

    Updated to 2.0

 SFML-1.6-cflags.patch      |   12 -----
 SFML-1.6-gcc.patch         |   22 ---------
 SFML-1.6-libpng15.patch    |   21 --------
 SFML-1.6-shared-libs.patch |  111 --------------------------------------------
 SFML.spec                  |   48 ++++++++-----------
 5 files changed, 19 insertions(+), 195 deletions(-)
---
diff --git a/SFML.spec b/SFML.spec
index 9c143bc..2559c6c 100644
--- a/SFML.spec
+++ b/SFML.spec
@@ -1,23 +1,19 @@
 Name:           SFML
-Version:        1.6
-Release:        10%{?dist}
+Version:        2.0
+Release:        1%{?dist}
 Summary:        Simple and Fast Multimedia Library
 
 # src/SFML/Audio/stb_vorbis/stb_vorbis.{c,h} are Public Domain
 License:        zlib and Public Domain
 URL:            http://www.sfml-dev.org/
-Source0:        http://downloads.sourceforge.net/sfml/%{name}-%{version}-sdk-linux-64.tar.gz
-Patch0:         %{name}-1.6-gcc.patch
-Patch1:         %{name}-1.6-shared-libs.patch
-Patch2:         %{name}-1.6-cflags.patch
-Patch3:         %{name}-1.6-libpng15.patch
+Source0:        http://downloads.sourceforge.net/sfml/%{name}-%{version}-sources.zip
 
+BuildRequires:  cmake
+BuildRequires:  doxygen
 BuildRequires:  freetype-devel
 BuildRequires:  glew-devel
 BuildRequires:  libjpeg-devel
-BuildRequires:  libpng-devel
 BuildRequires:  libsndfile-devel
-BuildRequires:  SOIL-devel
 BuildRequires:  libXrandr-devel
 BuildRequires:  openal-devel
 
@@ -39,32 +35,21 @@ developing applications that use %{name}.
 
 %prep
 %setup -q
-%patch0 -p1 -b .gcc
-%patch1 -p1 -b .shared-libs
-%patch2 -p1 -b .cflags
-%patch3 -p1 -b .libpng15
-
-# clean up bundled libs and prebuilt binaries
-find . -depth \( -iname glew -o -iname glext -o -iname libjpeg -o -iname libpng -o -iname SOIL -o -iname zlib \) -exec rm -rf {} \;
-rm -rf lib doc/%{name}.chm
-find samples/bin -type f -not -path \*datas\* -exec rm {} \;
-
-# 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||" {} \;
-
-# fix permissions
-find . -type f -exec chmod -x {} \;
+#make sure system-wide libraries are used
+rm -rf extlibs
 
 %build
-make %{?_smp_mflags} DEBUGFLAGS="$RPM_OPT_FLAGS"
+%cmake -DSFML_BUILD_DOC=TRUE .
+make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT DESTLIBDIR=$RPM_BUILD_ROOT%{_libdir} \
-    DESTINCDIR=$RPM_BUILD_ROOT%{_includedir}
+make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
+#remove duplicated documentation
+rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/*.txt
 
 %post -p /sbin/ldconfig
 
@@ -72,16 +57,21 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 
 %files
-%doc license.txt readme-en.txt
+%doc license.txt readme.txt
 %{_libdir}/*.so.*
+%{_datadir}/%{name}
 
 %files devel
-%doc doc/*
+%doc doc/html/*
 %{_includedir}/%{name}
+%{_libdir}/pkgconfig/sfml-*.pc
 %{_libdir}/*.so
 
 
 %changelog
+* Wed May 01 2013 Julian Sikorski <belegdol at fedoraproject.org> - 2.0-1
+- Updated to 2.0
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list