rpms/openlayers/F-11 .cvsignore, 1.3, 1.4 openlayers.spec, 1.3, 1.4 sources, 1.3, 1.4

[Mathieu Bridon]

Author: bochecha

Update of /cvs/pkgs/rpms/openlayers/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4763

Modified Files:
	.cvsignore openlayers.spec sources 
Log Message:
- removed the jsmin tool as its license is unacceptable in Fedora
- made a -doc subpackage, which makes the main package 75% smaller




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openlayers/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	4 Jul 2009 16:49:35 -0000	1.3
+++ .cvsignore	13 Sep 2009 12:50:31 -0000	1.4
@@ -1 +1 @@
-OpenLayers-2.8.tar.gz
+OpenLayers-2.8-mod.tar.gz


Index: openlayers.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openlayers/F-11/openlayers.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- openlayers.spec	4 Jul 2009 16:49:35 -0000	1.3
+++ openlayers.spec	13 Sep 2009 12:50:31 -0000	1.4
@@ -1,17 +1,32 @@
 Name:      openlayers
 Version:   2.8
-Release:   1%{?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 com
 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.
 # 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}/%{nam
 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}%{_
 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 at 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 at fedoraproject.org> - 2.8-3
+- Removed the bundled jsmin tool which license is unacptable in Fedora
+- This makes it a noarch package
+
 * Sun Jun 28 2009 Mathieu Bridon <bochecha at fedoraproject.org> - 2.8-1
 - New upstream version: 2.8
 - see http://trac.openlayers.org/wiki/Release/2.8/Notes


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openlayers/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	4 Jul 2009 16:49:35 -0000	1.3
+++ sources	13 Sep 2009 12:50:31 -0000	1.4
@@ -1 +1 @@
-660e279a00efaa6d058f5570425507fd  OpenLayers-2.8.tar.gz
+772fe3d7d00f5a7b5fb8560242f46074  OpenLayers-2.8-mod.tar.gz