rpms/libofa/devel libofa-0.9.3-gcc41.patch, NONE, 1.1 libofa-0.9.3-pkgconfig.patch, NONE, 1.1 libofa.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Tue Sep 12 17:00:17 UTC 2006

Author: rdieter

Update of /cvs/extras/rpms/libofa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22648/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libofa-0.9.3-gcc41.patch libofa-0.9.3-pkgconfig.patch 
	libofa.spec 
Log Message:
auto-import libofa-0.9.3-7 on branch devel from libofa-0.9.3-7.src.rpm

libofa-0.9.3-gcc41.patch:

--- NEW FILE libofa-0.9.3-gcc41.patch ---
--- libofa-0.9.3/lib/JAMA/tnt_math_utils.h.orig	2006-05-10 19:58:50.000000000 +0200
+++ libofa-0.9.3/lib/JAMA/tnt_math_utils.h	2006-07-23 08:17:40.000000000 +0200
@@ -20,6 +20,15 @@
 namespace TNT
 {
 /**
+	@returns the absolute value of a real (no-complex) scalar.
+*/
+template <class Real>
+Real abs(const Real &a)
+{
+	return  (a > 0 ? a : -a);
+}
+
+/**
 	@returns hypotenuse of real (non-complex) scalars a and b by 
 	avoiding underflow/overflow
 	using (a * sqrt( 1 + (b/a) * (b/a))), rather than
@@ -56,15 +65,6 @@
 }
 */
 
-/**
-	@returns the absolute value of a real (no-complex) scalar.
-*/
-template <class Real>
-Real abs(const Real &a)
-{
-	return  (a > 0 ? a : -a);
-}
-
 }
 #endif
 /* MATH_UTILS_H */

libofa-0.9.3-pkgconfig.patch:

--- NEW FILE libofa-0.9.3-pkgconfig.patch ---
--- libofa-0.9.3/libofa.pc.in.pkgconfig	2006-05-10 12:58:51.000000000 -0500
+++ libofa-0.9.3/libofa.pc.in	2006-09-12 07:56:00.000000000 -0500
@@ -7,6 +7,6 @@
 Description: The Open Fingerprint Architecture Library
 URL: http://www.musicdns.org/
 Version: @VERSION@
-Requires: fftw3
-Libs: -L${libdir} -lofa -lexpat -lm
+#Requires: fftw3
+Libs: -L${libdir} -lofa
 Cflags: -I${includedir}


--- NEW FILE libofa.spec ---

# Fedora Review:
# http://bugzilla.redhat.com/204954

Summary: 	Open Fingerprint Architecture library	
Name:		libofa	
Version:	0.9.3	
Release:	7%{?dist}

License:	GPL
Source0:	http://www.musicdns.org/themes/musicdns_org/downloads/libofa-%{version}.tar.gz
Url:		http://www.musicdns.org/
Group:		System Environment/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Patch1: libofa-0.9.3-gcc41.patch
# remove extraneous references in libofa.pc
Patch2: libofa-0.9.3-pkgconfig.patch

BuildRequires:	fftw3-devel 
BuildRequires:	curl-devel
BuildRequires:	expat-devel
BuildRequires:	findutils

%description
Currently, MusicDNS and the Open Fingerprint Architecture are being used to:
* identify duplicate tracks, even when the metadata is different, MusicIP
  identifies the master recording.
* fix metadata
* find out more about tracks by connecting to MusicBrainz

%package devel
Summary: Summary: Development headers and libraries for %{name}	
Group:   Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig
# removed by patch2
#Requires: curl-devel expat-devel fftw3-devel 
%description devel
%{summary}.


%prep
%setup -q

find . -name README -or -name \*.cpp -or -name \*.h | xargs --no-run-if-empty sed -i -e 's|\r||'  ||:

%patch1 -p1 -b .gcc41
%patch2 -p1 -b .pkgconfig


%build
%configure --disable-static

make %{?smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

make install DESTDIR=$RPM_BUILD_ROOT

# unpackaged files
rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la

# prepare docs
make -C examples clean
rm -rf examples/.deps


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig 

%postun -p /sbin/ldconfig


%files 
%defattr(-,root,root,-)
%doc AUTHORS README COPYING
%{_libdir}/lib*.so.*

%files devel
%defattr(-,root,root,-)
%doc examples/
%{_includedir}/*
%{_libdir}/pkgconfig/*.pc
%{_libdir}/lib*.so


%changelog
* Tue Sep 12 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.3-7
- fix rpmdoc handling

* Tue Sep 12 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.3-6
- de-DOS'ify .cpp, .h files too

* Tue Sep 12 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.3-5
- use sed instead of dos2unix
- omit examples/.deps

* Tue Sep 12 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.3-4
- remove extrenous entries from libofa.pc
- dos2unix README
- fix url in Source0
- -devel: %%doc examples/

* Mon Sep 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.3-3
- use gcc41 patch extracted from debian's patchset

* Mon Sep 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.3-2
- gcc41 patch

* Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.3-1
- first try


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libofa/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Sep 2006 16:59:41 -0000	1.1
+++ .cvsignore	12 Sep 2006 17:00:16 -0000	1.2
@@ -0,0 +1 @@
+libofa-0.9.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libofa/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2006 16:59:41 -0000	1.1
+++ sources	12 Sep 2006 17:00:16 -0000	1.2
@@ -0,0 +1 @@
+51507d2c4b432bd2755f48d58471696e  libofa-0.9.3.tar.gz


