rpms/spring-installer/F-10 spring-installer-20090316-systemcamlzip.patch, NONE, 1.1 spring-installer.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Aurelien Bompard]

Author: abompard

Update of /cvs/pkgs/rpms/spring-installer/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16239

Modified Files:
	.cvsignore sources 
Added Files:
	spring-installer-20090316-systemcamlzip.patch 
	spring-installer.spec 
Log Message:
import in F-10

spring-installer-20090316-systemcamlzip.patch:

--- NEW FILE spring-installer-20090316-systemcamlzip.patch ---
diff -up ./Makefile.systemcamlzip ./Makefile
--- ./Makefile.systemcamlzip	2009-03-17 21:51:18.000000000 +0100
+++ ./Makefile	2009-03-17 21:52:16.000000000 +0100
@@ -35,7 +35,7 @@ endif
 all: spring-installer ca-installer
 
 CAMLZIP = camlzip-1.04
-CAMLZIP_FLAGS = -I $(CAMLZIP) zip.cmxa
+CAMLZIP_FLAGS = zip.cmxa
 
 CAMLSEVENZIP = camlsevenzip
 CAMLSEVENZIP_FLAGS = -I $(CAMLSEVENZIP) sevenzip.cmxa
@@ -57,10 +57,10 @@ camlsevenzip:
 camlzip:
 	$(MAKE) -C $(CAMLZIP) allopt
 
-spring-installer: camlsevenzip camlzip $(SI_SOURCES)
+spring-installer: camlsevenzip $(SI_SOURCES)
 	ocamlfind ocamlopt -o spring-installer -linkpkg -package "$(SI_PACKAGES)" $(SI_FLAGS) $(SI_SOURCES)
 
-ca-installer: camlzip $(CI_SOURCES)
+ca-installer: $(CI_SOURCES)
 	ocamlfind ocamlopt -o ca-installer -thread -linkpkg -package "$(CI_PACKAGES)" $(CI_FLAGS) $(CI_SOURCES)
 
 install_spring-installer: spring-installer


--- NEW FILE spring-installer.spec ---
Name:           spring-installer
Version:        20090316
Release:        3%{?dist}
Summary:        Installer for the Spring game's maps and mods

Group:          Amusements/Games
License:        GPLv3+
URL:            http://www.caspring.org
Source0:        http://files.caspring.org/release/spring-installer_%{version}.orig.tar.gz
Patch0:         spring-installer-20090316-systemcamlzip.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  ocaml, ocaml-findlib, ocaml-extlib-devel, ocaml-lablgtk-devel
BuildRequires:  ocaml-ocamlnet-devel, ocaml-pcre-devel, chrpath, desktop-file-utils
BuildRequires:  gtk2-devel
%if 0%{?fedora} >= 11
BuildRequires:  ocaml-zip > 1.04
%endif

# For execstack
BuildRequires:  prelink

# For the mime package to associate files with spring-installer
Requires:       spring
# Spring does not build on PPC, exclude it here too
ExcludeArch:    ppc ppc64

%description
Spring Installer is a GTK+ program that will install your Spring mods
and maps for you.

%package -n     ca-installer
Summary:        Installer and updater for the C.A. Spring mod
Group:          Amusements/Games
# ca-installer is completely useless without spring itself
Requires:       spring
Requires:       hicolor-icon-theme

%description -n ca-installer
This package contains an automated installer and updater for the
Complete Annihilation Spring mod.


%prep
%setup -q
%if 0%{?fedora} >= 11
%patch0 -p0 -b .systemcamlzip
%endif
find camlsevenzip/libsevenzip -type f -exec chmod -x '{}' \;


%build
# Author says "If make is run with -j > 1 then compilation may fail"
#make %{?_smp_mflags}
make PREFIX=%{_prefix} GAMESBIN="bin"


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps/
make PREFIX=%{_prefix} \
     GAMESBIN="bin" \
     DESTDIR=$RPM_BUILD_ROOT \
     install_spring-installer \
     install_ca-installer

### Desktop files
# Spring-installer
desktop-file-install \
        --dir $RPM_BUILD_ROOT%{_datadir}/applications \
        --delete-original \
        $RPM_BUILD_ROOT%{_datadir}/applications/spring-installer.desktop
# CA-installer
sed -i -e 's/^Name=/Name=Spring /g' \
        $RPM_BUILD_ROOT%{_datadir}/applications/ca-installer.desktop
desktop-file-install \
        --dir $RPM_BUILD_ROOT%{_datadir}/applications \
        --add-category StrategyGame \
        --delete-original \
        $RPM_BUILD_ROOT%{_datadir}/applications/ca-installer.desktop

# Fix rpath. Very hard to do otherwise with ocaml
chrpath -d $RPM_BUILD_ROOT%{_bindir}/*
# Fix rpmlint warning about "executable stack". See Fedora bug #450551
execstack -c $RPM_BUILD_ROOT%{_bindir}/*


%post
# MimeType entry in the desktop file
update-desktop-database &> /dev/null || :

%postun
# MimeType entry in the desktop file
update-desktop-database &> /dev/null || :

%post -n ca-installer
# Icons
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :

%postun -n ca-installer
# Icons
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans -n ca-installer
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING
%{_bindir}/spring-installer
%{_datadir}/applications/*spring-installer.desktop

%files -n ca-installer
%defattr(-,root,root,-)
%doc COPYING
%{_bindir}/ca-installer
%{_datadir}/icons/hicolor/*/*/ca-installer.png
%{_datadir}/applications/*ca-installer.desktop


%changelog
* Tue Mar 17 2009 Aurelien Bompard <abompard at fedoraproject.org> 20090316-3
- use system camlzip on F11+

* Mon Mar 16 2009 Aurelien Bompard <abompard at fedoraproject.org> 20090316-2
- fix scriptlets
- fix permissions in camlsevenzip/libsevenzip
- package the COPYING file as %%doc

* Mon Mar 16 2009 Aurelien Bompard <abompard at fedoraproject.org> 20090316-1
- new version, with license information
- update icon scriptlets

* Wed Feb 04 2009 Aurelien Bompard <abompard at fedoraproject.org> 20090119-2
- Require spring
- Build only on archs where spring is available

* Mon Jan 19 2009 Aurelien Bompard <abompard at fedoraproject.org> 20090119-1
- version 20090119
- fix rpmlint executable-stack warning

* Mon Jan 19 2009 Aurelien Bompard <abompard at fedoraproject.org> 20090115-1
- version 20090115

* Sat Jan 17 2009 Aurelien Bompard <abompard at fedoraproject.org> 20081228-2
- drop vendor from desktop files

* Thu Jan 01 2009 Aurelien Bompard <abompard at fedoraproject.org> 20081228-1
- initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/spring-installer/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Mar 2009 03:20:56 -0000	1.1
+++ .cvsignore	18 Mar 2009 06:55:55 -0000	1.2
@@ -0,0 +1 @@
+spring-installer_20090316.orig.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/spring-installer/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Mar 2009 03:20:56 -0000	1.1
+++ sources	18 Mar 2009 06:55:55 -0000	1.2
@@ -0,0 +1 @@
+f0a59825d0e87d3efeedf54e05225fd8  spring-installer_20090316.orig.tar.gz