commit b36681826a38e2de7e2a5602aa4548fe80b65138 Author: bioinfornatics bioinfornatics@fedoraproject.org Date: Sat Jan 31 22:55:34 2015 +0100
fix spec
derelict.spec | 104 --------------------------------------------------------- 1 files changed, 0 insertions(+), 104 deletions(-) --- diff --git a/derelict.spec b/derelict.spec index 933059f..e6f31c1 100644 --- a/derelict.spec +++ b/derelict.spec @@ -3,109 +3,6 @@ # 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 -%global AL_snapdate 20140212 -%global AL_revision bd5bd3b -%global AL_alphatag %{AL_snapdate}git%{AL_revision} -# git clone https://github.com/DerelictOrg/DerelictALURE.git -# (cd DerelictALURE && git rev-parse --short HEAD) -# git archive --prefix=derelict-%%{snapdate}/ALURE/ HEAD --format=tar | xz > ../derelictALURE-%%{ALURE_alphatag}.tar.xz -%global ALURE_snapdate 20140303 -%global ALURE_revision 402884c -%global ALURE_alphatag %{ALURE_snapdate}git%{ALURE_revision} -# git clone https://github.com/DerelictOrg/DerelictASSIMP3.git -# (cd DerelictASSIMP3 && git rev-parse --short HEAD) -# git archive --prefix=derelict-%%{snapdate}/ASSIMP3/ HEAD --format=tar | xz > ../derelictASSIMP3-%%{ASSIMP3_alphatag}.tar.xz -%global ASSIMP3_snapdate 20131222 -%global ASSIMP3_revision 2300879 -%global ASSIMP3_alphatag %{ASSIMP3_snapdate}git%{ASSIMP3_revision} -# git clone https://github.com/DerelictOrg/DerelictFI.git -# (cd DerelictFI && git rev-parse --short HEAD) -# git archive --prefix=derelict-%%{snapdate}/FI/ HEAD --format=tar | xz > ../derelictFI-%%{FI_alphatag}.tar.xz -%global FI_snapdate 20140127 -%global FI_revision c5786f4 -%global FI_alphatag %{FI_snapdate}git%{FI_revision} -# git clone https://github.com/DerelictOrg/DerelictFT.git -# (cd DerelictFT && git rev-parse --short HEAD) -# git archive --prefix=derelict-%%{snapdate}/FT/ HEAD --format=tar | xz > ../derelictFT-%%{FT_alphatag}.tar.xz -%global FT_snapdate 20131222 -%global FT_revision 8e46c9f -%global FT_alphatag %{FT_snapdate}git%{FT_revision} -# git clone https://github.com/DerelictOrg/DerelictGL3.git -# (cd DerelictGL3 && git rev-parse --short HEAD) -# git archive --prefix=derelict-%%{snapdate}/GL3/ HEAD --format=tar | xz > ../derelictGL3-%%{GL3_alphatag}.tar.xz -%global GL3_snapdate 20140303 -%global GL3_revision 0ad2f17 -%global GL3_alphatag %{GL3_snapdate}git%{GL3_revision} -# git clone https://github.com/DerelictOrg/DerelictGLFW3.git -# (cd DerelictGLFW3 && git rev-parse --short HEAD) -# git archive --prefix=derelict-%%{snapdate}/GLFW3/ HEAD --format=tar | xz > ../derelictGLFW3-%%{GLFW3_alphatag}.tar.xz -%global GLFW3_snapdate 20131222 -%global GLFW3_revision dc988f5 -%global GLFW3_alphatag %{GLFW3_snapdate}git%{GLFW3_revision} -# git clone https://github.com/DerelictOrg/DerelictIL.git -# (cd DerelictIL && git rev-parse --short HEAD) -# git archive --prefix=derelict-%%{snapdate}/IL/ HEAD --format=tar | xz > ../derelictIL-%%{IL_alphatag}.tar.xz -%global IL_snapdate 20131222 -%global IL_revision 8c70f90 -%global IL_alphatag %{IL_snapdate}git%{IL_revision} -# git clone https://github.com/DerelictOrg/DerelictLua.git -# (cd DerelictLua && git rev-parse --short HEAD) -# git archive --prefix=derelict-%%{snapdate}/Lua/ HEAD --format=tar | xz > ../derelictLua-%%{Lua_alphatag}.tar.xz -%global Lua_snapdate 20140508 -%global Lua_revision a6d2f46 -%global Lua_alphatag %{Lua_snapdate}git%{Lua_revision} -# git clone https://github.com/DerelictOrg/DerelictODE.git -# (cd DerelictODE && git rev-parse --short HEAD) -# git archive --prefix=derelict-%%{snapdate}/ODE/ HEAD --format=tar | xz > ../derelictODE-%%{ODE_alphatag}.tar.xz -%global ODE_snapdate 20140212 -%global ODE_revision f0138fb -%global ODE_alphatag %{ODE_snapdate}git%{ODE_revision} -# git clone https://github.com/DerelictOrg/DerelictOgg.git -# (cd DerelictOgg && git rev-parse --short HEAD) -# git archive --prefix=derelict-%%{snapdate}/Ogg/ HEAD --format=tar | xz > ../derelictOgg-%%{Ogg_alphatag}.tar.xz -%global Ogg_snapdate 20131222 -%global Ogg_revision d48d50d -%global Ogg_alphatag %{Ogg_snapdate}git%{Ogg_revision} -# git clone https://github.com/DerelictOrg/DerelictPHYSFS.git -# (cd DerelictPHYSFS && git rev-parse --short HEAD) -# git archive --prefix=derelict-%%{snapdate}/PHYSFS/ HEAD --format=tar | xz > ../derelictPHYSFS-%%{PHYSFS_alphatag}.tar.xz -%global PHYSFS_snapdate 20131222 -%global PHYSFS_revision 1405994 -%global PHYSFS_alphatag %{PHYSFS_snapdate}git%{PHYSFS_revision} -# git clone https://github.com/DerelictOrg/DerelictPQ.git -# (cd DerelictPQ && git rev-parse --short HEAD) -# git archive --prefix=derelict-%%{snapdate}/PQ/ HEAD --format=tar | xz > ../derelictPQ-%%{PQ_alphatag}.tar.xz -%global PQ_snapdate 20131222 -%global PQ_revision ebd72df -%global PQ_alphatag %{PQ_snapdate}git%{PQ_revision} -# git clone https://github.com/DerelictOrg/DerelictSDL2.git -# (cd DerelictSDL2 && git rev-parse --short HEAD) -# git archive --prefix=derelict-%%{snapdate}/SDL2/ HEAD --format=tar | xz > ../derelictSDL2-%%{SDL2_alphatag}.tar.xz -%global SDL2_snapdate 20140502 -%global SDL2_revision d549b0d -%global SDL2_alphatag %{SDL2_snapdate}git%{SDL2_revision} -# git clone https://github.com/DerelictOrg/DerelictSFML2.git -# (cd DerelictSFML2 && git rev-parse --short HEAD) -# git archive --prefix=derelict-%%{snapdate}/SFML2/ HEAD --format=tar | xz > ../derelictSFML2-%%{SFML2_alphatag}.tar.xz -%global SFML2_snapdate 20140413 -%global SFML2_revision 26a3eda -%global SFML2_alphatag %{SFML2_snapdate}git%{SFML2_revision} -# git clone https://github.com/DerelictOrg/DerelictUtil.git -# (cd DerelictUtil && git rev-parse --short HEAD) -# git archive --prefix=derelict-%%{snapdate}/Util/ HEAD --format=tar | xz > ../derelictUtil-%%{Util_alphatag}.tar.xz -%global Util_snapdate 20140422 -%global Util_revision 16940c7 -%global Util_alphatag %{Util_snapdate}git%{Util_revision} -# git clone https://github.com/DerelictOrg/DerelictVorbis.git -# (cd DerelictVorbis && git rev-parse --short HEAD) -# 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} @@ -193,7 +90,6 @@
%global Vorbis_snapdate 20150122 %global Vorbis_revision c5e47eb ->>>>>>> 3db3e94... update to latist red %global Vorbis_alphatag %{Vorbis_snapdate}git%{Vorbis_revision}
scm-commits@lists.fedoraproject.org