rpms/proj/devel import.log,1.1,1.2 proj.spec,1.19,1.20

Balint Cristian rezso at fedoraproject.org
Thu Mar 18 06:31:04 UTC 2010


Author: rezso

Update of /cvs/pkgs/rpms/proj/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9197/devel

Modified Files:
	import.log proj.spec 
Log Message:
- fix for bz#556091



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/proj/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	9 Sep 2008 11:48:04 -0000	1.1
+++ import.log	18 Mar 2010 06:31:01 -0000	1.2
@@ -1 +1,2 @@
 proj-4_6_1-1_fc10:HEAD:proj-4.6.1-1.fc10.src.rpm:1220960846
+proj-4_7_0-2_fc13:HEAD:proj-4.7.0-2.fc13.src.rpm:1268893793


Index: proj.spec
===================================================================
RCS file: /cvs/pkgs/rpms/proj/devel/proj.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- proj.spec	4 Dec 2009 19:18:35 -0000	1.19
+++ proj.spec	18 Mar 2010 06:31:03 -0000	1.20
@@ -1,43 +1,55 @@
-Name:		proj
-Version:	4.7.0
-Release:	1%{?dist}
-Summary:	Cartographic projection software (PROJ.4)
-
-Group:		Applications/Engineering
-License:	MIT
-URL:		http://proj.osgeo.org
-Source0:	http://download.osgeo.org/proj/proj-%{version}.tar.gz
-Source1:	http://download.osgeo.org/proj/proj-datumgrid-1.5.zip
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Name:           proj
+Version:        4.7.0
+Release:        2%{?dist}
+Summary:        Cartographic projection software (PROJ.4)
+
+Group:          Applications/Engineering
+License:        MIT
+URL:            http://proj.osgeo.org
+Source0:        http://download.osgeo.org/proj/proj-%{version}.tar.gz
+Source1:        http://download.osgeo.org/proj/proj-datumgrid-1.5.zip
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	libtool
+BuildRequires:  libtool
 
-%package devel
-Summary:	Development files for PROJ.4
-Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-
-%package nad
-Summary:	US and Canadian datum shift grids for PROJ.4
-Group:		Applications/Engineering
-Requires:	%{name} = %{version}-%{release}
-
-%package epsg
-Summary:	EPSG dataset for PROJ.4
-Group:		Applications/Engineering
-Requires:	%{name} = %{version}-%{release}
 
 %description
 Proj and invproj perform respective forward and inverse transformation of
 cartographic data to or from cartesian data with a wide range of selectable
 projection functions. Proj docs: http://www.remotesensing.org/dl/new_docs/
 
+
+%package devel
+Summary:        Development files for PROJ.4
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+
 %description devel
 This package contains libproj and the appropriate header files and man pages.
 
+
+%package static
+Summary:        Development files for PROJ.4
+Group:          Development/Libraries
+
+%description static
+This package contains libproj static library.
+
+
+%package nad
+Summary:        US and Canadian datum shift grids for PROJ.4
+Group:          Applications/Engineering
+Requires:       %{name} = %{version}-%{release}
+
 %description nad
 This package contains additional US and Canadian datum shift grids.
 
+
+%package epsg
+Summary:        EPSG dataset for PROJ.4
+Group:          Applications/Engineering
+Requires:       %{name} = %{version}-%{release}
+
 %description epsg
 This package contains additional EPSG dataset.
 
@@ -104,9 +116,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 %{_includedir}/*.h
 %{_libdir}/*.so
-%{_libdir}/*.a
+%exclude %{_libdir}/*.a
 %exclude %{_libdir}/libproj.la
 
+%files static
+%defattr(-,root,root,-)
+%{_libdir}/*.a
+%{_libdir}/libproj.la
+
+
 %files nad
 %defattr(-,root,root,-)
 %doc nad/README
@@ -117,11 +135,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}
 
 %files epsg
-%doc nad/README
 %defattr(-,root,root,-)
+%doc nad/README
 %attr(0644,root,root) %{_datadir}/%{name}/epsg
 
 %changelog
+* Thu Mar 18 2010 Balint Cristian <cristian.balint at gmail.com> - 4.7.0-2
+- fix for bz#556091
+
 * Fri Dec 4 2009 Devrim GÜNDÜZ <devrim at gunduz.org> 4.7.0-1
 - Update to 4.7.0
 - Update to new datumgrid (1.5)



More information about the scm-commits mailing list