rpms/grib_api/devel grib_api.spec,1.5,1.6 import.log,1.2,1.3

[Jeroen van Meeuwen]

Author: kanarip

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

Modified Files:
	grib_api.spec import.log 
Log Message:
1.7.0-2


Index: grib_api.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grib_api/devel/grib_api.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- grib_api.spec	1 Apr 2009 08:13:20 -0000	1.5
+++ grib_api.spec	4 Apr 2009 14:48:13 -0000	1.6
@@ -19,7 +19,7 @@
 
 %package devel
 Summary:    GRIB API development headers
-Group:      Development/Libraries
+Group:      Development/Languages
 Requires:   %{name} = %{version}-%{release}
 Requires:   %{name}-static = %{version}-%{release}
 
@@ -28,7 +28,7 @@
 
 %package static
 Summary:    GRIB API static libraries
-Group:      Development/Libraries
+Group:      Applications/System
 Requires:   %{name} = %{version}-%{release}
 Requires:   %{name}-devel = %{version}-%{release}
 
@@ -52,6 +52,9 @@
     iconv -f ISO88591 -t utf-8 $file > $file.new && mv $file.new $file || rm -f $file.new
 done
 
+# Move %{_bindir}/parser because it conflicts with coda-client
+mv %{buildroot}/%{_bindir}/parser %{buildroot}/%{_bindir}/grib-parser
+
 # Give these files some normal permissions
 chmod 644 INSTALL README LICENSE COPYING.LESSER ChangeLog AUTHORS gpl-3.0.txt
 
@@ -61,7 +64,6 @@
 %files
 %defattr(-,root,root,-)
 %doc INSTALL README LICENSE COPYING.LESSER ChangeLog AUTHORS gpl-3.0.txt
-%dir %{_datadir}/%{name}
 %doc %{_datadir}/%{name}/samples/
 %doc %{_datadir}/%{name}/definitions/
 %{_bindir}/*
@@ -69,7 +71,7 @@
 %files devel
 %defattr(-,root,root,-)
 %doc INSTALL README LICENSE COPYING.LESSER ChangeLog AUTHORS gpl-3.0.txt
-%{_includedir}/*
+%{_prefix}/include/*
 
 %files static
 %defattr(-,root,root,-)
@@ -77,10 +79,8 @@
 %{_libdir}/*.a
 
 %changelog
-* Wed Apr  1 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.7.0-2
-- Fix unowned directory.
-- Fix subpackage Group tags.
-- Use %%_includedir in files section.
+* Sat Apr 04 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 1.7.0-2
+- Fix file conflict (#492936)
 
 * Tue Mar 17 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 1.7.0-1
 - New upstream version


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/grib_api/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	18 Mar 2009 03:05:01 -0000	1.2
+++ import.log	4 Apr 2009 14:48:13 -0000	1.3
@@ -1,2 +1,3 @@
 grib_api-1_6_1-1_fc10:HEAD:grib_api-1.6.1-1.fc10.src.rpm:1222729912
 grib_api-1_7_0-1_fc11:HEAD:grib_api-1.7.0-1.fc11.src.rpm:1237345477
+grib_api-1_7_0-2_fc11:HEAD:grib_api-1.7.0-2.fc11.src.rpm:1238856479