rpms/erlang-esdl/F-12 esdl-CFLAGS.diff, NONE, 1.1 import.log, NONE, 1.1 erlang-esdl.spec, 1.11, 1.12

[Peter Lemenkov]

Author: peter

Update of /cvs/pkgs/rpms/erlang-esdl/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv17337/F-12

Modified Files:
	erlang-esdl.spec 
Added Files:
	esdl-CFLAGS.diff import.log 
Log Message:
Narrowed requirements and several other fixes

esdl-CFLAGS.diff:
 Makefile |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE esdl-CFLAGS.diff ---
--- c_src/Makefile~	2009-05-20 22:34:48.000000000 +0400
+++ c_src/Makefile	2010-06-23 22:11:50.678812591 +0400
@@ -43,8 +43,7 @@
   INCS                  = $(GL_INCS) $(SDL_INCS)  $(SDL_TTF_INCS) \
                           $(SDL_IMAGE_INCS) $(ERL_INCS)
 
-  CFLAGS		= -g -O2 -funroll-loops -Wall -ffast-math -fpic \
-			-fomit-frame-pointer $(USE_GL_INCLUDE_DIR) -DSHM \
+  CFLAGS		+= -fPIC $(USE_GL_INCLUDE_DIR) -DSHM \
                         $(USE_SDL_TTF) $(USE_SDL_IMAGE) \
 			-DPTHREADS $(INCS)
 


--- NEW FILE import.log ---
erlang-esdl-1_0_1-4_fc14:F-12:erlang-esdl-1.0.1-4.fc14.src.rpm:1278941814


Index: erlang-esdl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/erlang-esdl/F-12/erlang-esdl.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- erlang-esdl.spec	20 Aug 2009 16:30:26 -0000	1.11
+++ erlang-esdl.spec	12 Jul 2010 13:37:23 -0000	1.12
@@ -1,19 +1,24 @@
 Name:           erlang-esdl
 Version:        1.0.1
-Release:        1%{?dist}
-Summary:        Erlang OpenGL/SDL api and utilities
+Release:        4%{?dist}
+Summary:        Erlang OpenGL/SDL API and utilities
 
 Group:          Development/Libraries
 License:        MIT
 URL:            http://esdl.sourceforge.net
-Source:		http://download.sourceforge.net/esdl/esdl-%{version}.src.tar.gz
+Source0:	http://download.sourceforge.net/esdl/esdl-%{version}.src.tar.gz
+Patch0:		esdl-CFLAGS.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL-devel
 BuildRequires:	libGL-devel
 BuildRequires:	libGLU-devel
-BuildRequires:	erlang = R13B
-Requires:	erlang = R13B
+BuildRequires:	erlang
+BuildRequires:	dos2unix
+Requires:	erlang-erts
+Requires:	erlang-kernel
+Requires:	erlang-stdlib
 Provides:	esdl = %{version}-%{release}
+Obsoletes:	%{name}-devel < 1.0.1-2
 
 
 %description
@@ -21,38 +26,35 @@ A library that gives you access to SDL a
 your Erlang program.
 
 
-%package devel
-Summary:	Development files for ESDL
-Group:          Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-
-%description devel
-Development files for ESDL.
-
-
 %define erlangdir %{_libdir}/erlang
 
 %prep
 %setup -q -n esdl-%{version}
+%patch0 -p0 -b .cflags
+chmod 0644 Readme license.terms
+find -type f -name '*.[eh]rl' -exec chmod 0644 {} \;
+find -type f -name '*.[ch]' -exec chmod 0644 {} \;
+find -type f -name '*.[eh]rl' | xargs dos2unix
+find -type f -name '*.[ch]' | xargs dos2unix
+dos2unix Readme
 
 
 %build
-PATH=%{erlangdir}/bin:$PATH make %{?_smp_mflags}
+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
-chmod 0644 Readme
 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 '*.hrl' | xargs chmod 0644
-find $RPM_BUILD_ROOT%{erlangdir}/lib -name '*.erl' | 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
@@ -62,19 +64,29 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc Readme license.terms
-%{erlangdir}/lib/esdl-%{version}
-%exclude %{erlangdir}/lib/esdl-%{version}/include
-%exclude %{erlangdir}/lib/esdl-%{version}/src
-
-
-%files devel
-%defattr(-,root,root,-)
-%doc doc/*.html
+%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
 
 
 %changelog
+* Mon Jul 12 2010 Peter Lemenkov <lemenkov at gmail.com> - 1.0.1-4
+- Rebuild with new Erlang/OTP R14A
+- Small typo in %%changelog was fixed
+
+* Thu Jun 24 2010 Peter Lemenkov <lemenkov at gmail.com> - 1.0.1-3
+- Fix building on x86_64
+
+* Wed Jun 23 2010 Peter Lemenkov <lemenkov at gmail.com> - 1.0.1-2
+- Rebuild
+- Narrowed explicit requires
+- No longer mention exact erlang's version in (Build)Requires
+- Drop *-devel subpackage (includes moved to main package)
+- Use Fedora-specific CFLAGS
+- Fixed DOS line endings and permissions
+
 * Tue Aug 11 2009 Gerard Milmeister <gemi at bluewin.ch> - 1.0.1-1
 - new release 1.0.1