commit 3501ee85fe33664137590f6c075b6fbe8cc2f05c
Author: bioinfornatics <bioinfornatics(a)fedoraproject.org>
Date: Sat Jan 31 22:52:28 2015 +0100
fix spec
derelict.spec | 26 +-------------------------
1 files changed, 1 insertions(+), 25 deletions(-)
---
diff --git a/derelict.spec b/derelict.spec
index c69a3c2..cd7a585 100644
--- a/derelict.spec
+++ b/derelict.spec
@@ -363,28 +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
-%setup -q -b 3 -n %{name}-%{Util_alphatag}/ASSIMP3
-%setup -q -b 4 -n %{name}-%{Util_alphatag}/FI
-%setup -q -b 5 -n %{name}-%{Util_alphatag}/FT
-%setup -q -b 6 -n %{name}-%{Util_alphatag}/GL3
-%setup -q -b 7 -n %{name}-%{Util_alphatag}/GLFW3
-%setup -q -b 8 -n %{name}-%{Util_alphatag}/IL
-%setup -q -b 9 -n %{name}-%{Util_alphatag}/Lua
-%setup -q -b 10 -n %{name}-%{Util_alphatag}/ODE
-%setup -q -b 11 -n %{name}-%{Util_alphatag}/Ogg
-%setup -q -b 12 -n %{name}-%{Util_alphatag}/PHYSFS
-%setup -q -b 13 -n %{name}-%{Util_alphatag}/PQ
-%setup -q -b 14 -n %{name}-%{Util_alphatag}/SDL2
-%setup -q -b 15 -n %{name}-%{Util_alphatag}/SFML2
-%setup -q -b 16 -n %{name}-%{Util_alphatag}/Vorbis
-
-# 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}
@@ -404,9 +383,6 @@ sed -i '/PGVerbosity function(PGconn conn,/ s/PGconn conn/PGconn*
conn/' %{_buil
%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