From 57ab2aff0903c044f5444b95988aa9b9c5197c5d Mon Sep 17 00:00:00 2001
From: Mathieu Bridon <bochecha@fedoraproject.org>
Date: Sep 13 2009 12:37:41 +0000
Subject: - removed the jsmin tool as its license is unacceptable in Fedora

- made a -doc subpackage, which makes the main package 75% smaller

---

diff --git a/.cvsignore b/.cvsignore
index 74fffba..13de343 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-OpenLayers-2.8.tar.gz
+OpenLayers-2.8-mod.tar.gz
diff --git a/openlayers.spec b/openlayers.spec
index ce0b892..d020963 100644
--- a/openlayers.spec
+++ b/openlayers.spec
@@ -1,17 +1,32 @@
 Name:      openlayers
 Version:   2.8
-Release:   2%{?dist}
+Release:   4%{?dist}
 Summary:   A JavaScript library for displaying map data in web browsers
 Group:     Applications/Publishing
 License:   BSD
 URL:       http://www.openlayers.org/
-Source0:   http://openlayers.org/download/OpenLayers-%{version}.tar.gz
+# Source is modified as it bundles jsmin which license is unacceptable in Fedora:
+#   $ wget http://openlayers.org/download/OpenLayers-%{version}.tar.gz
+#   $ tar xzvf OpenLayers-%{version}.tar.gz
+#   $ cd OpenLayers-%{version}
+#   $ rm tools/jsmin.{c,py}
+#   $ tar czvf OpenLayers-%{version}-mod.tar.gz OpenLayers-%{version}
+Source0:   OpenLayers-%{version}-mod.tar.gz
 Source1:   openlayers.conf
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch: noarch
 
 BuildRequires: python
 
-Requires: httpd
+Requires:   httpd
+
+
+%package doc
+Summary:    API documentation for %{name}
+
+Group:      Documentation
+Requires:   %{name} = %{version}-%{release}
+
 
 %description
 OpenLayers is a pure JavaScript library for displaying map data in most
@@ -28,6 +43,10 @@ in object-oriented JavaScript, using components from Prototype.js and the
 Rico library. The OpenLayers code base already has hundreds of unit tests,
 via the Test.AnotherWay framework.
 
+%description doc
+Reference API documentation for the OpenLayers JavaScript library.
+
+
 %prep
 %setup -q -n OpenLayers-%{version}
 
@@ -62,13 +81,13 @@ sed -i -e 's|\r||g' tools/exampleparser.py
 # fix shebag
 find . -type f -exec sed -i -e 's/\#\!\/usr\/bin\/env python/\#\!\/usr\/bin\/python/' '{}' +
 
-%build
 
-gcc %{optflags} tools/jsmin.c -o tools/jsmin
+%build
 pushd build
 ./build.py
 popd
 
+
 %install
 rm -rf %{buildroot}
 install -d %{buildroot}%{_datadir}/%{name}/www
@@ -82,11 +101,8 @@ cp -rp lib %{buildroot}%{_datadir}/%{name}/
 cp -rp tests %{buildroot}%{_datadir}/%{name}/
 
 # install tools
-install -d %{buildroot}%{_bindir}
 install -d %{buildroot}%{_datadir}/%{name}/tools/
-install -p tools/jsmin %{buildroot}%{_bindir}/
 install -p tools/BeautifulSoup.py %{buildroot}%{_datadir}/%{name}/tools/
-install -p tools/jsmin.py %{buildroot}%{_datadir}/%{name}/tools/
 install -p tools/mergejs.py %{buildroot}%{_datadir}/%{name}/tools/
 install -p tools/minimize.py %{buildroot}%{_datadir}/%{name}/tools/
 install -p tools/shrinksafe.py %{buildroot}%{_datadir}/%{name}/tools/
@@ -118,18 +134,18 @@ install -D -p %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/%{name}.conf
 chmod -x %{buildroot}%{_datadir}/%{name}/lib/OpenLayers/Strategy.js
 chmod -x %{buildroot}%{_datadir}/%{name}/lib/OpenLayers/Protocol.js
 
+
 %clean
 rm -rf %{buildroot}
 
+
 %files
 %defattr(-,root,root)
-%doc examples doc
 %doc news.txt readme.txt release-license.txt repository-license.txt
 %doc tools/README.txt build/license.txt tools/exampleparser.py
 %dir %{_sysconfdir}/%{name}
 %attr(644,root,root) %config(noreplace) %{_sysconfdir}/%{name}/*.cfg
 %attr(644,root,root) %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
-%attr(755,root,root) %{_bindir}/*
 %dir %{_datadir}/%{name}
 %exclude %{_datadir}/%{name}/tools/*.py?
 %exclude %{_datadir}/%{name}/build/*.txt
@@ -137,7 +153,19 @@ rm -rf %{buildroot}
 %exclude %{_datadir}/%{name}/build/OpenLayers.js
 %{_datadir}/%{name}/*
 
+%files doc
+%defattr(-,root,root)
+%doc examples doc
+
+
 %changelog
+* Sun Sep 13 2009 Mathieu Bridon <bochecha@fedoraproject.org> - 2.8-4
+- Make a -doc subpackage for the API documentation which makes the main package 75% smaller
+
+* Sun Sep 13 2009 Mathieu Bridon <bochecha@fedoraproject.org> - 2.8-3
+- Removed the bundled jsmin tool which license is unacptable in Fedora
+- This makes it a noarch package
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index 5255ef9..e6cf392 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-660e279a00efaa6d058f5570425507fd  OpenLayers-2.8.tar.gz
+772fe3d7d00f5a7b5fb8560242f46074  OpenLayers-2.8-mod.tar.gz