commit 82a74f434aaeedfdbe6463b78fde1ef14e695eab
Author: bioinfornatics <bioinfornatics(a)fedoraproject.org>
Date: Sat Jan 31 22:24:58 2015 +0100
update to latist red
derelict.spec | 127 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 127 insertions(+), 0 deletions(-)
---
diff --git a/derelict.spec b/derelict.spec
index f5842fc..c69a3c2 100644
--- a/derelict.spec
+++ b/derelict.spec
@@ -3,6 +3,7 @@
# The source for this package was pulled from upstream's git.
# Use the following commands to generate the tarball:
+<<<<<<< HEAD
# git clone
https://github.com/DerelictOrg/DerelictAL.git
# (cd DerelictAL && git rev-parse --short HEAD)
# git archive --prefix=derelict-%%{snapdate}/AL/ HEAD --format=tar | xz >
../derelictAL-%%{AL_alphatag}.tar.xz
@@ -104,6 +105,95 @@
# git archive --prefix=derelict-%%{snapdate}/Vorbis/ HEAD --format=tar | xz >
../derelictVorbis-%%{Vorbis_alphatag}.tar.xz
%global Vorbis_snapdate 20131222
%global Vorbis_revision 64b26fc
+=======
+%global AL_snapdate 20140927
+%global AL_revision d339322
+%global AL_alphatag %{AL_snapdate}git%{AL_revision}
+
+
+%global ALURE_snapdate 20140518
+%global ALURE_revision 52eed1b
+%global ALURE_alphatag %{ALURE_snapdate}git%{ALURE_revision}
+
+
+%global ASSIMP3_snapdate 20140518
+%global ASSIMP3_revision 415831b
+%global ASSIMP3_alphatag %{ASSIMP3_snapdate}git%{ASSIMP3_revision}
+
+
+%global FI_snapdate 20150118
+%global FI_revision 7dc3401
+%global FI_alphatag %{FI_snapdate}git%{FI_revision}
+
+
+%global FT_snapdate 20150128
+%global FT_revision 2b83825
+%global FT_alphatag %{FT_snapdate}git%{FT_revision}
+
+
+%global GL3_snapdate 20150116
+%global GL3_revision d8f4b52
+%global GL3_alphatag %{GL3_snapdate}git%{GL3_revision}
+
+
+%global GLFW3_snapdate 20150124
+%global GLFW3_revision e0d02a9
+%global GLFW3_alphatag %{GLFW3_snapdate}git%{GLFW3_revision}
+
+
+%global IL_snapdate 20140929
+%global IL_revision ff159fe
+%global IL_alphatag %{IL_snapdate}git%{IL_revision}
+
+
+%global Lua_snapdate 20150105
+%global Lua_revision 888e7bd
+%global Lua_alphatag %{Lua_snapdate}git%{Lua_revision}
+
+
+%global ODE_snapdate 20141102
+%global ODE_revision a93b6de
+%global ODE_alphatag %{ODE_snapdate}git%{ODE_revision}
+
+
+%global Ogg_snapdate 20150122
+%global Ogg_revision 887f200
+%global Ogg_alphatag %{Ogg_snapdate}git%{Ogg_revision}
+
+
+%global PHYSFS_snapdate 20140929
+%global PHYSFS_revision 469cbb7
+%global PHYSFS_alphatag %{PHYSFS_snapdate}git%{PHYSFS_revision}
+
+
+%global PQ_snapdate 20140925
+%global PQ_revision f9cb4df
+%global PQ_alphatag %{PQ_snapdate}git%{PQ_revision}
+
+
+%global SDL2_snapdate 20150113
+%global SDL2_revision a998c8f
+%global SDL2_alphatag %{SDL2_snapdate}git%{SDL2_revision}
+
+
+%global SFML2_snapdate 20150122
+%global SFML2_revision 5b5f207
+%global SFML2_alphatag %{SFML2_snapdate}git%{SFML2_revision}
+
+
+%global Theora_snapdate 20150122
+%global Theora_revision b4dc705
+%global Theora_alphatag %{Theora_snapdate}git%{Theora_revision}
+
+
+%global Util_snapdate 20141022
+%global Util_revision 7fc1714
+%global Util_alphatag %{Util_snapdate}git%{Util_revision}
+
+
+%global Vorbis_snapdate 20150122
+%global Vorbis_revision c5e47eb
+>>>>>>> 3db3e94... update to latist red
%global Vorbis_alphatag %{Vorbis_snapdate}git%{Vorbis_revision}
@@ -167,7 +257,11 @@ popd
\
Name: derelict
Version: 3
+<<<<<<< HEAD
Release: 29.%{Util_alphatag}%{?dist}
+=======
+Release: 31.%{Util_alphatag}%{?dist}
+>>>>>>> 3db3e94... update to latist red
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
@@ -269,6 +363,7 @@ Fichier d'entête et bibliothèque pour derelict à utiliser en
langage D.
%add_subpackage -n Vorbis
%prep
+<<<<<<< HEAD
%setup -q -b 0 -n %{name}-%{Util_alphatag}
%setup -q -b 1 -n %{name}-%{Util_alphatag}/AL
%setup -q -b 2 -n %{name}-%{Util_alphatag}/ALURE
@@ -289,6 +384,29 @@ Fichier d'entête et bibliothèque pour derelict à utiliser en
langage D.
# bug reported
https://github.com/DerelictOrg/DerelictPQ/issues/1
sed -i '/PGVerbosity function(PGconn conn,/ s/PGconn conn/PGconn* conn/'
%{_builddir}/%{name}-%{Util_alphatag}/PQ/source/derelict/pq/pq.d
+=======
+%setup -q -b 0 -n %{name}-Util-%{Util_alphatag}
+%setup -q -b 1 -n %{name}-AL-%{AL_alphatag}
+%setup -q -b 2 -n %{name}-ALURE-%{ALURE_alphatag}
+%setup -q -b 3 -n %{name}-ASSIMP3-%{ASSIMP3_alphatag}
+%setup -q -b 4 -n %{name}-FI-%{FI_alphatag}
+%setup -q -b 5 -n %{name}-FT-%{FT_alphatag}
+%setup -q -b 6 -n %{name}-GL3-%{GL3_alphatag}
+%setup -q -b 7 -n %{name}-GLFW3-%{GLFW3_alphatag}
+%setup -q -b 8 -n %{name}-IL-%{IL_alphatag}
+%setup -q -b 9 -n %{name}-Lua-%{Lua_alphatag}
+%setup -q -b 10 -n %{name}-ODE-%{ODE_alphatag}
+%setup -q -b 11 -n %{name}-Ogg-%{Ogg_alphatag}
+%setup -q -b 12 -n %{name}-PHYSFS-%{PHYSFS_alphatag}
+%setup -q -b 13 -n %{name}-PQ-%{PQ_alphatag}
+%setup -q -b 14 -n %{name}-SDL2-%{SDL2_alphatag}
+%setup -q -b 15 -n %{name}-SFML2-%{SFML2_alphatag}
+%setup -q -b 16 -n %{name}-Theora-%{Theora_alphatag}
+%setup -q -b 17 -n %{name}-Vorbis-%{Vorbis_alphatag}
+
+# bug reported
https://github.com/DerelictOrg/DerelictPQ/issues/4
+# sed -i 's/PQnotcieProcessor/PQnoticeProcessor/g'
%{_builddir}/%{name}-PQ-%{PQ_alphatag}/PQ/source/derelict/pq/pq.d
+>>>>>>> 3db3e94... update to latist red
# temp geany config directory for allow geany to generate tags
mkdir -p geany_config
@@ -644,6 +762,15 @@ install -p -d %{buildroot}%{_libdir}
%add_files -n Vorbis Vorbis vorbis
%changelog
+<<<<<<< HEAD
+=======
+* Sat Jan 31 2015 Jonathan MERCIER <bioinfornatics(a)gmail.com> -
3-31.20141022git7fc1714
+- update to latest rev
+
+* Tue Sep 16 2014 bioinfornatics - 3-30.20140710gita786b4b
+- Update to latest revision
+
+>>>>>>> 3db3e94... update to latist red
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
3-29.20140422git16940c7
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild