rpms/osiv/devel osiv_configure_unknown_arg.patch, NONE, 1.1 osiv.spec, 1.6, 1.7

[Ed Hill (edhill)]

Author: edhill

Update of /cvs/pkgs/rpms/osiv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2469

Modified Files:
	osiv.spec 
Added Files:
	osiv_configure_unknown_arg.patch 
Log Message:
upstream dropped auto-tools so work around the build quirks

osiv_configure_unknown_arg.patch:

--- NEW FILE osiv_configure_unknown_arg.patch ---
--- configure_OLD	2007-08-26 13:02:12.000000000 -0400
+++ configure	2007-08-26 13:02:31.000000000 -0400
@@ -1560,7 +1560,7 @@
       --target)     shift; VAL="$1";;
     *)
       printf "$PARAM_MSG1" "$VAR" 1>&2;
-      exit 1;
+      # exit 1;
     esac 
   fi
 
@@ -1583,7 +1583,7 @@
     --target)     PARAM_TARGET=$VAL;;
     *)
       printf "$PARAM_MSG1" "$VAR" 1>&2;
-      exit 1;
+      # exit 1;
   esac
 
   # Move to next arg


Index: osiv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/osiv/devel/osiv.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- osiv.spec	26 Aug 2007 04:46:34 -0000	1.6
+++ osiv.spec	26 Aug 2007 17:43:44 -0000	1.7
@@ -1,16 +1,28 @@
 Name:           osiv
 Version:        2.0.0
-Release:        0.1.beta%{?dist}
+Release:        0.2.beta%{?dist}
 Summary:        Open Source Image Velocimetry
 
 Group:          Applications/Engineering
 License:        GPL
 URL:            http://osiv.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/osiv/osiv-2.0.0-beta.tar.gz
+Patch0:         osiv_configure_unknown_arg.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  fftw-devel, libtiff-devel
 
+%package devel
+Summary:        Development files for osiv
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}-static = %{version}-%{release}
+
+%package static
+Summary:        Static libs for osiv
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+
 %description
 OSIV is a program written to perform cross-correlation analysis of
 particle image velocimetry (PIV) images.  The program was designed to
@@ -19,9 +31,16 @@
 PIV toolkit.  Importantly, OSIV is released open source so that users
 may contribute back to the project.
 
+%description devel
+This package contains the osiv header files.
+
+%description static
+This package contains the osiv static libs.
+
 
 %prep
-%setup -q
+%setup -q -n osiv-2.0.0-beta
+%patch -p0
 
 %build
 %configure
@@ -29,7 +48,13 @@
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-%makeinstall
+# export 
+make INCDIR=${RPM_BUILD_ROOT}/%{_includedir} LIBDIR=${RPM_BUILD_ROOT}/%{_libdir} \
+    BINDIR=${RPM_BUILD_ROOT}/%{_bindir} MANDIR=${RPM_BUILD_ROOT}/%{_mandir} \
+    DATADIR=${RPM_BUILD_ROOT}/%{_datadir} install
+rm -f ${RPM_BUILD_ROOT}/%{_datadir}/*.dvi
+rm -f ${RPM_BUILD_ROOT}/%{_datadir}/*.eps
+rm -f ${RPM_BUILD_ROOT}/%{_datadir}/*.ps
 #
 # TODO: package the ./java files
 
@@ -38,11 +63,25 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING AUTHORS
+%doc COPYING README TODO
 %{_bindir}/*
 %{_mandir}/man1/*
+%{_datadir}/%{name}
+
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/*
+%{_mandir}/man3/*
+
+%files static
+%defattr(-,root,root,-)
+%{_libdir}/*.a
+
 
 %changelog
+* Sun Aug 26 2007 Ed Hill <ed at eh3.com> - 2.0.0-0.2
+- upstream dropped auto-tools so work around the build quirks 
+
 * Sun Aug 26 2007 Ed Hill <ed at eh3.com> - 2.0.0-0.1
 - new upstream 2.0.0-beta