[derelict/f18] new rev
MERCIER Jonathan
bioinfornatics at fedoraproject.org
Wed Oct 3 20:19:18 UTC 2012
commit a136c265d865abf0906a1d16f63e3d318c8194ac
Author: Jonathan MERCIER <bioinfornatics at gmail.com>
Date: Wed Oct 3 22:19:11 2012 +0200
new rev
.gitignore | 1 +
derelict.spec | 407 ++++++++++++++++-----------------------------------------
sources | 2 +-
3 files changed, 115 insertions(+), 295 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c57632f..5afec02 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/derelict-20111106svn593.tar.xz
/derelict-20120820svn631.tar.xz
+/derelict-20120923gitb4f810c.tar.xz
diff --git a/derelict.spec b/derelict.spec
index f2a6dae..d050e31 100644
--- a/derelict.spec
+++ b/derelict.spec
@@ -1,27 +1,63 @@
-%global alphatag 20120820
-%global svn_revision svn631
-%global debug_package %{nil}
-
-# The source for this package was pulled from upstream's subversion (svn).
+%global snapdate 20120923
+%global derelict_revision b4f810c
+%global alphatag %{snapdate}git%{derelict_revision}
+
+%define add_subpackage(n:) \
+%package %{-n*} \
+Summary: Libraries to use %{-n*} \
+Summary(fr): Bibliothèque pour utiliser %{-n*} \
+Requires: %{name}%{?_isa} = %{version}-%{release} \
+Requires: %* \
+%description %{-n*} \
+Libraries for %{-n*} to use in D programming language. \
+%description -l fr %{-n*} \
+Bibliothèque pour %{-n*} à utiliser en langage D. \
+%package %{-n*}-devel \
+Summary: Header files and libraries for %{-n*} \
+Summary(fr): Fichier d'entête et bibliothèque pour %{-n*} \
+Requires: %{name}%{?_isa} = %{version}-%{release} \
+Requires: %* \
+%description %{-n*}-devel \
+Header files and libraries for %{-n*} to use in D programming language. \
+%description -l fr %{-n*}-devel \
+Fichier d'entête et bibliothèque pour %{-n*} à utiliser en langage D. \
+%{nil}
+
+%define add_files(n:) \
+%post %{-n*} -p /sbin/ldconfig \
+%postun %{-n*} -p /sbin/ldconfig \
+%files %{-n*} \
+%{_libdir}/libDerelict%1.so.3 \
+%{_libdir}/libDerelict%1.so.3.0.0 \
+%files %{-n*}-devel \
+%{_libdir}/libDerelict%1.so \
+%{_d_includedir}/%{name}/%2 \
+%{nil}
+
+# The source for this package was pulled from upstream's git.
# Use the following commands to generate the tarball:
-# svn export -r 593 http://svn.dsource.org/projects/derelict/branches/Derelict2 derelict-20111106svn593
-# tar -cJvf derelict-20111106svn593.tar.xz derelict-20111106svn593
+# git clone git://github.com/aldacron/Derelict3.git
+# cd derelict;
+# git rev-parse --short HEAD -> for derelict_revision
+# git checkout %%derelict_rev
+# git archive --prefix=derelict-%%{alphatag}/ HEAD --format=tar | xz > ../derelict-%%{alphatag}.tar.xz
Name: derelict
-Version: 2
-Release: 23.%{alphatag}%{svn_revision}%{?dist}
+Version: 3
+Release: 2.%{alphatag}%{?dist}
Summary: Collection of D bindings to C shared libraries
+Summary(fr): Collection de bibliothèque en D interfaçant des bibliothèques dynamiques en C
License: Boost
URL: http://www.dsource.org/projects/
-Source0: %{name}-%{alphatag}%{svn_revision}.tar.xz
-BuildRequires: ldc, ldc-phobos-devel, ldc-druntime-devel
+Source0: %{name}-%{alphatag}.tar.xz
+BuildRequires: ldc, ldc-phobos-devel
%description
derelict supports some useful features for project development, including:
- Cross-Platform Consistency
-derelict loads shared libraries manually at runtime and throws an exception
+derelict loads shared libraries manually at run-time and throws an exception
when the library, or any symbol in the library, fails to load. This gives you
complete control over how to handle the case of a missing shared library. You
can fall back to a different code path, give your users a helpful error message
@@ -61,314 +97,97 @@ dépasser
ce comportement et permettre à la version la plus ancienne de derelict de se
charger avec succès.
-%package AL-devel
-Summary: Support for developing D application
-Provides: AL-static = %{version}-%{release}
-BuildRequires: openal-soft-devel
-Requires: %{name} = %{version}-%{release}
-Requires: derelict-Util-devel
-Requires: openal-soft
-
-%description AL-devel
-The derelictAL-devel package contains header files for developing D
-applications that use derelictAL.
-
-%description AL-devel -l fr
-Le paquet derelictAL-devel contient les fichiers d'entêtes pour développer
-des applications en D utilisant derelictAL.
-
-%package allegro-devel
-Summary: Support for developing D application
-Provides: allegro-static = %{version}-%{release}
-Requires: %{name} = %{version}-%{release}
-Requires: ldc-phobos-devel, ldc-druntime-devel
-Requires: derelict-Util-devel
-Requires: allegro5, allegro5-devel
-Requires: allegro5-addon-acodec, allegro5-addon-acodec-devel
-Requires: allegro5-addon-audio, allegro5-addon-audio-devel
-Requires: allegro5-addon-dialog, allegro5-addon-dialog-devel
-Requires: allegro5-addon-image, allegro5-addon-image-devel
-Requires: allegro5-addon-physfs, allegro5-addon-physfs-devel
-Requires: allegro5-addon-ttf, allegro5-addon-ttf-devel
-
-%description allegro-devel
-The derelict-allegro-devel package contains header files for developing D
-applications that use allegro library for use in computer games and other types
-of multimedia programming.
-
-%description allegro-devel -l fr
-Le paquet derelict-allegro-devel contient les fichiers d'entêtes pour développer
-des applications en D utilisant allegro.
-
-%package FT-devel
-Summary: Support for developing D application
-Provides: FT-static = %{version}-%{release}
-Requires: %{name} = %{version}-%{release}
-Requires: ldc-phobos-devel, ldc-druntime-devel
-Requires: derelict-Util-devel
-
-%description FT-devel
-The derelict-FT-devel package contains header files for developing D
-applications that use derelictFT.
-
-%description FT-devel -l fr
-Le paquet derelict-FT-devel contient les fichiers d'entêtes pour développer
-des applications en D utilisant derelictFT.
-
-
-%package GL-devel
-Summary: Support for developing D application
-Provides: GL-static = %{version}-%{release}
-BuildRequires: mesa-libGL-devel, mesa-libGLU-devel, mesa-libGLw-devel
-Requires: %{name} = %{version}-%{release}
-Requires: ldc-phobos-devel, ldc-druntime-devel
-Requires: derelict-Util-devel
-Requires: mesa-libGL, mesa-libGLU, mesa-libGLw
-
-%description GL-devel
-The derelict-GL-devel package contains header files for developing D
-applications that use derelict-GL.
-
-%description GL-devel -l fr
-Le paquet derelict-GL-devel contient les fichiers d'entêtes pour développer
-des applications en D utilisant derelict-GL.
-
-
-%package IL-devel
-Summary: Support for developing D application
-Provides: IL-static = %{version}-%{release}
-Requires: %{name} = %{version}-%{release}
-BuildRequires: DevIL-ILUT-devel
-Requires: ldc-phobos-devel, ldc-druntime-devel
-Requires: derelict-Util-devel
-Requires: DevIL, DevIL-ILUT
-
-%description IL-devel
-The derelictIL-devel package contains header files for developing D
-applications that use derelictIL.
-
-%description IL-devel -l fr
-Le paquet derelict-IL-devel contient les fichiers d'entêtes pour développer
-des applications en D utilisant derelict-IL.
-
-
-%package ODE-devel
-Summary: Support for developing D application
-Provides: ODE-static = %{version}-%{release}
-Requires: %{name} = %{version}-%{release}
-Requires: ldc-phobos-devel, ldc-druntime-devel
-Requires: derelict-Util-devel
-Requires: ode
-
-%description ODE-devel
-The derelict-ODE-devel package contains header files for developing D
-applications that use derelictODE.
-
-%description ODE-devel -l fr
-Le paquet derelic-tODE-devel contient les fichiers d'entêtes pour développer
-des applications en D utilisant derelict-ODE.
-
-
-%package Ogg-devel
-Summary: Support for developing D application
-Provides: Ogg-static = %{version}-%{release}
-Requires: %{name} = %{version}-%{release}
-Requires: ldc-phobos-devel, ldc-druntime-devel
-Requires: derelict-Util-devel
-Requires: libvorbis
-
-%description Ogg-devel
-The derelict-Ogg-devel package contains header files for developing D
-applications that use derelictOgg.
-
-%description Ogg-devel -l fr
-Le paquet derelict-Ogg-devel contient les fichiers d'entêtes pour développer
-des applications en D utilisant derelict-Ogg.
-
-
-%package PA-devel
-Summary: Support for developing D application
-Provides: PA-static = %{version}-%{release}
-Requires: %{name} = %{version}-%{release}
-Requires: ldc-phobos-devel, ldc-druntime-devel
-Requires: derelict-Util-devel
-
-%description PA-devel
-The derelict-PA-devel package contains header files for developing D
-applications that use derelictPA.
-
-%description PA-devel -l fr
-Le paquet derelict-PA-devel contient les fichiers d'entêtes pour développer
-des applications en D utilisant derelict-PA.
-
-
-%package SDL-devel
-Summary: Support for developing D application
-Provides: SDL-static = %{version}-%{release}
-Requires: %{name} = %{version}-%{release}
-Requires: ldc-phobos-devel, ldc-druntime-devel
-Requires: derelict-Util-devel
-BuildRequires: SDL-devel, SDL_image-devel, SDL_mixer-devel, SDL_net-devel
-BuildRequires: SDL_sound-devel, SDL_ttf-devel, SDL_gfx-devel
-Requires: SDL, SDL_image, SDL_mixer, SDL_net
-Requires: SDL_sound, SDL_ttf, SDL_gfx
-
-%description SDL-devel
-The derelict-SDL-devel package contains header files for developing D
-applications that use derelict-SDL.
-
-%description SDL-devel -l fr
-Le paquet derelict-SDL-devel contient les fichiers d'entêtes pour développer
-des applications en D utilisant derelict-SDL.
-
-
-%package SFML-devel
-Summary: Support for developing D application
-Provides: SFML-static = %{version}-%{release}
-Requires: %{name} = %{version}-%{release}
-Requires: ldc-phobos-devel, ldc-druntime-devel
-Requires: derelict-Util-devel
-Requires: SFML-devel
-
-%description SFML-devel
-The derelict-SFML-devel package contains header files for developing D
-applications that use derelictSFML.
-
-%description SFML-devel -l fr
-Le paquet derelict-SFML-devel contient les fichiers d'entêtes pour développer
-des applications en D utilisant derelict-SFML.
-
-
-%package Util-devel
-Summary: Support for developing D application
-Provides: Util-static = %{version}-%{release}
-Requires: %{name} = %{version}-%{release}
-Requires: ldc-phobos-devel, ldc-druntime-devel
-
-%description Util-devel
-The DerelictUtil-devel package contains header files for developing D
-applications that use DerelictUtil.
-
-%description Util-devel -l fr
-Le paquet Derelict-Util-devel contient les fichiers d'entêtes pour développer
-des applications en D utilisant Derelict-Util.
-
-
-%package geany-tags
-Summary: Support for enable autocompletion in geany
-Requires: %{name} = %{version}-%{release}
+%package devel
+Summary: Header files and libraries for derelict
+Summary(fr): Fichier d'entête et bibliothèque pour derelict
+Requires: %{name}%{?_isa} = %{version}-%{release}
BuildRequires: geany
-Requires: geany
-%description geany-tags
-Enable autocompletion for derelict library in geany (IDE)
+%description devel
+Header files and libraries for derelict to use in D programming language.
+%description -l fr devel
+Fichier d'entête et bibliothèque pour derelict à utiliser en langage D.
+
+%add_subpackage -n gl mesa-libGL mesa-libGLU mesa-libGLw
+%add_subpackage -n glfw glfw
+%add_subpackage -n DevIL DevIL DevIL-ILUT
+%add_subpackage -n openAL openal-soft
+%add_subpackage -n alure alure
+%add_subpackage -n freetype freetype
+%add_subpackage -n SDL SDL SDL_image SDL_mixer SDL_net SDL_sound SDL_ttf SDL_gfx
+%add_subpackage -n ode ode
+%add_subpackage -n assimp assimp
+%add_subpackage -n freeglut freeglut
+%add_subpackage -n freeimage freeimage
+%add_subpackage -n sfml SFML
-%description -l fr geany-tags
-Active l'autocompletion pour pour la bibliothèque derelict dans geany (IDE)
%prep
-%setup -q -n %{name}-%{alphatag}%{svn_revision}
-find . -type f | xargs sed -i 's/\\x0a/\n/g'
-find . -type f | xargs sed -i 's/^M$//'
-
-mv inc/ldc_inc.mak inc/ldc2_inc.mak
-
-find . -name "Makefile" | xargs sed -i "s/ldc_build/ldc2_build/g"
-
+%setup -q -n %{name}-%{alphatag}
# temp geany config directory for allow geany to generate tags
mkdir -p geany_config
+sed -i "s/ldc2 /ldc2 -g /g" build/build.d
%build
+# build the builder
+pushd build
+ldc2 %{_d_optflags} -d-version=Shared build.d
# build derelict
-make -f linux.mak DC=ldc2 DFLAGS="%{_d_optflags}" \
- DerelictAL_ALL \
- DerelictAllegro_ALL \
- DerelictFT_ALL \
- DerelictGL_ALL \
- DerelictIL_ALL \
- DerelictODE_ALL \
- DerelictOgg_ALL \
- DerelictPA_ALL \
- DerelictSDL_ALL \
- DerelictSFML_ALL \
- DerelictUtil_ALL
-# fix file from bad multi-line comment format and some extra \x0a
-find import/%{name} -name "*.di" | xargs sed -i 's/\\x0a/\n/'g
-find import/%{name} -name "*.di" | xargs sed -i '$!N;s|/\*\s*\n\(\s*\)\*\*|/**\n\1*|g'
-find import/%{name} -name "*.di" | xargs sed -i '$!N;s|/\*\s*\n\(\s*\)\*\*|/**\n\1*|g'
+./derelict
+popd
# generate geany tags
-geany -c geany_config -g derelict.d.tags $(find import/%{name} -name "*.di")
+geany -c geany_config -g derelict.d.tags $(find import/%{name} -name "*.d")
%install
-mkdir -p %{buildroot}/%{_datadir}/geany/tags/
+mkdir -p %{buildroot}%{_datadir}/geany/tags/
mkdir -p %{buildroot}%{_d_includedir}/%{name}
mkdir -p %{buildroot}%{_libdir}
# install derelict headers
cp -rp import/%{name}/* %{buildroot}%{_d_includedir}/%{name}/
# install derelict libs
-cp -p lib/* %{buildroot}%{_libdir}/
+cp -p lib/*so.3.0.0 %{buildroot}%{_libdir}/
+pushd %{buildroot}%{_libdir}/
+for lib in lib*.so.3.0.0; do
+ ln -s $lib $(basename $lib .0.0)
+ ln -s $(basename $lib .0.0) $(basename $lib .3.0.0)
+done
+popd
# install geany tags
-install -m0755 derelict.d.tags %{buildroot}/%{_datadir}/geany/tags/
-rm %{buildroot}%{_libdir}/DUMMY.txt
+install -m0644 derelict.d.tags %{buildroot}/%{_datadir}/geany/tags/
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
%files
-%doc doc/*
+%doc README.markdown
%{_d_includedir}/%{name}
-
-%files AL-devel
-%{_d_includedir}/%{name}/openal
-%{_libdir}/libDerelictAL.a
-
-%files allegro-devel
-%{_d_includedir}/%{name}/allegro
-%{_libdir}/libDerelictAllegro*.a
-
-%files FT-devel
-%{_d_includedir}/%{name}/freetype
-%{_libdir}/libDerelictFT.a
-
-%files GL-devel
-%{_d_includedir}/%{name}/opengl
-%{_libdir}/libDerelictGL*.a
-
-%files IL-devel
-%{_d_includedir}/%{name}/devil
-%{_libdir}/libDerelictIL*.a
-
-%files ODE-devel
-%{_d_includedir}/%{name}/ode
-%{_libdir}/libDerelictODE.a
-
-%files Ogg-devel
-%{_d_includedir}/%{name}/ogg
-%{_libdir}/libDerelictOGG.a
-%{_libdir}/libDerelictVorbis*.a
-
-%files PA-devel
-%{_d_includedir}/%{name}/portaudio
-%{_libdir}/libDerelictPA.a
-
-%files SDL-devel
-%{_d_includedir}/%{name}/sdl
-%{_libdir}/libDerelictSDL*.a
-
-%files SFML-devel
-%{_d_includedir}/%{name}/sfml
-%{_libdir}/libDerelictSFML*.a
-
-%files Util-devel
+%{_datadir}/geany/tags/derelict.d.tags
+%{_libdir}/libDerelictUtil.so.3
+%{_libdir}/libDerelictUtil.so.3.0.0
+%files devel
+%{_libdir}/libDerelictUtil.so
%{_d_includedir}/%{name}/util
-%{_libdir}/libDerelictUtil.a
-%files geany-tags
-%{_datadir}/geany/tags/derelict.d.tags
+%add_files -n gl GL3 opengl3
+%add_files -n glfw GLFW3 glfw3
+%add_files -n DevIL IL devil
+%add_files -n openAL AL openal
+%add_files -n alure ALURE alure
+%add_files -n freetype FT freetype
+%add_files -n SDL SDL2 sdl2
+%add_files -n ode ODE ode
+%add_files -n assimp ASSIMP assimp
+%add_files -n freeglut FG freeglut
+%add_files -n freeimage FI freeimage
+%add_files -n sfml SFML2 sfml2
+
%changelog
-* Mon Aug 20 2012 Jon Ciesla <limburgher at gmail.com> - 2-22.20120820svn631
-- New upstream to fix ode build.
+* Tue Aug 14 2012 Jonathan MERCIER <bioinfornatics at gmail.com> - 3-2.20120811git8bcc53b
+- update to newest release Derelict 3
-* Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2-22.20111106svn593
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+* Wed Feb 01 2012 Jonathan MERCIER <bioinfornatics at gmail.com> - 2-22.20111106svn593
+- rebuild dmdfe 2.059
* Wed Feb 01 2012 Jonathan MERCIER <bioinfornatics at gmail.com> - 2-21.20111106svn593
- fix broken dependencies
@@ -393,7 +212,7 @@ rm %{buildroot}%{_libdir}/DUMMY.txt
* Mon Dec 19 2011 Jonathan MERCIER <bioinfornatics at gmail.com> 2-15.20111106svn593
- Remove BuildRoot Tag
- Remove extra target DerelictFT for make they are already DerelictFT_ALL
-- Remove DdocToDevhelp
+- Remove DdocTodevhelp
- %%doc owns doc/*
- fix changelog
diff --git a/sources b/sources
index 29db620..05b71e2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3cae22aca00fd88172c9ce1966073d69 derelict-20120820svn631.tar.xz
+99855ebc816429dbacff0b4cc708d06c derelict-20120923gitb4f810c.tar.xz
More information about the scm-commits
mailing list