[erlang-esdl] Ver. 1.3 (API compatible)
Peter Lemenkov
peter at fedoraproject.org
Sun Mar 10 06:42:12 UTC 2013
commit 95fccab970e35e0cde9b9ad2b98620acd50ee11b
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Sun Mar 10 10:41:55 2013 +0400
Ver. 1.3 (API compatible)
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
.gitignore | 1 +
...lang-esdl-0001-Use-fedora-specific-CFLAGS.patch | 8 +-
erlang-esdl.spec | 78 +++++++-------
esdl-0001-Fix-compability-with-R15B-drivers.patch | 110 --------------------
...x-compilation-for-earlier-erlang-versions.patch | 50 ---------
sources | 2 +-
6 files changed, 46 insertions(+), 203 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 694a2ba..8c68203 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
esdl-1.0.1.src.tar.gz
/esdl-1.2.src.tar.gz
+/dgud-esdl-esdl-1.3-0-g8b922fb.tar.gz
diff --git a/esdl-0003-Use-fedora-specific-CFLAGS.patch b/erlang-esdl-0001-Use-fedora-specific-CFLAGS.patch
similarity index 82%
rename from esdl-0003-Use-fedora-specific-CFLAGS.patch
rename to erlang-esdl-0001-Use-fedora-specific-CFLAGS.patch
index 0cbfa89..9c317a4 100644
--- a/esdl-0003-Use-fedora-specific-CFLAGS.patch
+++ b/erlang-esdl-0001-Use-fedora-specific-CFLAGS.patch
@@ -1,11 +1,11 @@
-From 6598ecb52d83cfb90c6771a77eed3db5df2971b6 Mon Sep 17 00:00:00 2001
+From e71f6de802cac96cdd2c30c3e849ab423c3458f5 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Thu, 10 May 2012 18:36:04 +0400
-Subject: [PATCH 3/3] Use fedora-specific CFLAGS
+Subject: [PATCH 1/1] Use fedora-specific CFLAGS
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
- c_src/Makefile | 3 +--
+ c_src/Makefile | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/c_src/Makefile b/c_src/Makefile
@@ -23,5 +23,5 @@ index b943cfe..e5be170 100755
-DPTHREADS $(INCS)
--
-1.7.10.1
+1.8.1.4
diff --git a/erlang-esdl.spec b/erlang-esdl.spec
index 8522508..d390809 100644
--- a/erlang-esdl.spec
+++ b/erlang-esdl.spec
@@ -1,24 +1,31 @@
-Name: erlang-esdl
-Version: 1.2
-Release: 3%{?dist}
+%global realname esdl
+%global upstream dgud
+%global git_tag 8b922fb
+%global patchnumber 0
+%{?filter_setup:
+%filter_provides_in %{_libdir}/erlang/lib/.*\.so$
+%filter_setup
+}
+
+
+Name: erlang-%{realname}
+Version: 1.3
+Release: 1%{?dist}
Summary: Erlang OpenGL/SDL API and utilities
-
Group: Development/Libraries
License: MIT
URL: http://esdl.sourceforge.net
-Source0: http://download.sourceforge.net/esdl/esdl-%{version}.src.tar.gz
-Patch1: esdl-0001-Fix-compability-with-R15B-drivers.patch
-Patch2: esdl-0002-Fix-compilation-for-earlier-erlang-versions.patch
-Patch3: esdl-0003-Use-fedora-specific-CFLAGS.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# wget --content-disposition https://github.com/dgud/esdl/tarball/esdl-1.3
+Source0: %{upstream}-%{realname}-esdl-%{version}-%{patchnumber}-g%{git_tag}.tar.gz
+Patch1: erlang-esdl-0001-Use-fedora-specific-CFLAGS.patch
BuildRequires: SDL-devel
BuildRequires: erlang
BuildRequires: dos2unix
-Requires: erlang-erts
-Requires: erlang-kernel
-Requires: erlang-stdlib
-# Dynamically loaded
-Requires: erlang-wx
+Requires: erlang-erts%{?_isa}
+Requires: erlang-kernel%{?_isa}
+Requires: erlang-stdlib%{?_isa}
+# Dynamically loads erl_gl.so in sdl_video:setVideoMode/4
+Requires: erlang-wx%{?_isa}
Provides: esdl = %{version}-%{release}
Obsoletes: %{name}-devel < 1.0.1-2
@@ -31,10 +38,8 @@ your Erlang program.
%define erlangdir %{_libdir}/erlang
%prep
-%setup -q -n esdl-%{version}
-%patch1 -p1 -b .r15
-%patch2 -p1 -b .other_releases
-%patch3 -p1 -b .cflags
+%setup -q -n %{upstream}-%{realname}-e30f6f8
+%patch1 -p1 -b .cflags
chmod 0644 Readme license.terms
find -type f -name '*.[eh]rl' -exec chmod 0644 {} \;
find -type f -name '*.[ch]' -exec chmod 0644 {} \;
@@ -48,34 +53,31 @@ CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{erlangdir}/lib
-make INSTALLDIR=$RPM_BUILD_ROOT%{erlangdir}/lib/esdl-%{version} install
+mkdir -p %{buildroot}%{_libdir}/erlang/lib
+make INSTALLDIR=%{buildroot}%{_libdir}/erlang/lib/esdl-%{version} install
find . -name '*.html' | xargs chmod 0644
-find $RPM_BUILD_ROOT%{erlangdir}/lib -name 'Readme*' | xargs rm -f
-find $RPM_BUILD_ROOT%{erlangdir}/lib -name 'license*' | xargs rm -f
-find $RPM_BUILD_ROOT%{erlangdir}/lib -name '*.beam' | xargs chmod 0644
-find $RPM_BUILD_ROOT%{erlangdir}/lib -name doc | xargs rm -fr
-rm -f $RPM_BUILD_ROOT%{erlangdir}/lib/esdl-%{version}/vsn.mk
-rm -rf $RPM_BUILD_ROOT%{erlangdir}/lib/esdl-%{version}/c_src
-rm -rf $RPM_BUILD_ROOT%{erlangdir}/lib/esdl-%{version}/src/*.erl
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+find %{buildroot}%{_libdir}/erlang/lib -name 'Readme*' | xargs rm -f
+find %{buildroot}%{_libdir}/erlang/lib -name 'license*' | xargs rm -f
+find %{buildroot}%{_libdir}/erlang/lib -name '*.beam' | xargs chmod 0644
+find %{buildroot}%{_libdir}/erlang/lib -name doc | xargs rm -fr
+rm -f %{buildroot}%{_libdir}/erlang/lib/esdl-%{version}/vsn.mk
+rm -rf %{buildroot}%{_libdir}/erlang/lib/esdl-%{version}/c_src
+rm -rf %{buildroot}%{_libdir}/erlang/lib/esdl-%{version}/src/*.erl
%files
-%defattr(-,root,root,-)
%doc Readme license.terms
-%dir %{erlangdir}/lib/esdl-%{version}
-%{erlangdir}/lib/esdl-%{version}/ebin
-%{erlangdir}/lib/esdl-%{version}/include
-%{erlangdir}/lib/esdl-%{version}/priv
-%{erlangdir}/lib/esdl-%{version}/src
+%dir %{_libdir}/erlang/lib/%{realname}-%{version}/
+%{_libdir}/erlang/lib/%{realname}-%{version}/ebin
+%{_libdir}/erlang/lib/%{realname}-%{version}/include
+%{_libdir}/erlang/lib/%{realname}-%{version}/priv
+%{_libdir}/erlang/lib/%{realname}-%{version}/src
%changelog
+* Sat Mar 09 2013 Peter Lemenkov <lemenkov at gmail.com> - 1.3-1
+- Ver. 1.3 (API compatible)
+
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/sources b/sources
index 927c2db..7f32cc6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3e96c1d47bd7c1e23285360d88ce1bea esdl-1.2.src.tar.gz
+74d6b4c283aff75df35928416bc7d183 dgud-esdl-esdl-1.3-0-g8b922fb.tar.gz
More information about the scm-commits
mailing list