rpms/getdata/devel getdata-mstrings.diff, NONE, 1.1 getdata.spec, 1.7, 1.8

[Matthew D Truch]

Author: mtruch

Update of /cvs/extras/rpms/getdata/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22578

Modified Files:
	getdata.spec 
Added Files:
	getdata-mstrings.diff 
Log Message:
Include upstream bugfix patch, as well as properly install fortran .mod.


getdata-mstrings.diff:
 meta_list.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE getdata-mstrings.diff ---
diff -ur getdata-0.5.0/src/meta_list.c getdata-0.5.0-tests-fixed/src/meta_list.c
--- getdata-0.5.0/src/meta_list.c	2008-11-23 19:08:56.000000000 -0500
+++ getdata-0.5.0-tests-fixed/src/meta_list.c	2009-09-18 23:01:01.000000000 -0400
@@ -123,7 +123,7 @@
     if (e->meta_entry[i]->field_type == GD_STRING_ENTRY)
       fl[n++] = e->meta_entry[i]->e->string;
   }
-  fl[i] = NULL;
+  fl[n] = NULL;
 
   e->string_value_list = (const char**)fl;
 


Index: getdata.spec
===================================================================
RCS file: /cvs/extras/rpms/getdata/devel/getdata.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- getdata.spec	24 Jul 2009 23:54:16 -0000	1.7
+++ getdata.spec	22 Sep 2009 05:15:08 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           getdata
 Version:        0.5.0
-Release:        3%{?dist}
+Release:        5%{?dist}
 Summary:        Library for reading and writing dirfile data
 
 Group:          Development/Libraries
@@ -9,6 +9,8 @@ URL:            http://getdata.sourcefor
 Source0:        http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:         getdata-mstrings.diff
+
 BuildRequires:     gcc-gfortran zlib-devel libtool-ltdl-devel bzip2-devel
 Requires(post):    /sbin/ldconfig
 Requires(postun):  /sbin/ldconfig
@@ -24,6 +26,7 @@ Group:  Development/Libraries
 Summary: Headers required when building programs against getdata
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
+Requires: gcc-gfortran%{_isa}
 
 %description devel
 Headers required when building a program against the GetData library.
@@ -51,10 +54,11 @@ Does not yet allow writing of bzip2 enco
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 # FIXME: FFLAGS/FCFLAGS are not being honored; looking into it with upstream.
-%configure --disable-static --enable-modules --enable-debug
+%configure --disable-static --enable-modules
 make %{?_smp_mflags}
 
 %check
@@ -68,6 +72,9 @@ make DESTDIR=%{buildroot} SUID_ROOT="" i
 rm -f %{buildroot}/%{_libdir}/lib*.la
 # Remove simple docs, as we install them ourselves (along with others)
 rm -f %{buildroot}/%{_datadir}/doc/%{name}/*
+# Place fortran module in the correct location
+mkdir -p %{buildroot}/%{_fmoddir}
+mv %{buildroot}/%{_includedir}/getdata.mod  %{buildroot}/%{_fmoddir}/
 
 %clean
 rm -rf %{buildroot}
@@ -92,6 +99,7 @@ rm -rf %{buildroot}
 %{_includedir}/*
 %{_mandir}/man3/*
 %{_libdir}/pkgconfig/getdata.pc
+%{_fmoddir}/getdata.mod
 
 %files gzip
 %defattr(-,root,root,-)
@@ -102,6 +110,13 @@ rm -rf %{buildroot}
 %{_libdir}/libgetdatabzip2*.so
 
 %changelog
+* Mon Sep 21 2009 Matthew Truch <matt at truch.net> - 0.5.0-5
+- Include bugfix from upstream.
+- Put fortran module in correct place. BZ 523539
+
+* Mon Jul 27 2009 Matthew Truch <matt at truch.net> - 0.5.0-4
+- Disable verbose debugging output.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild