dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: gsl
-# $Id: Makefile,v 1.1 2004/09/09 05:53:02 cvsdist Exp $
-NAME := gsl
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

gsl-1.10-head.patch

@@ -0,0 +1,12 @@
+diff -up gsl-1.10/gsl-config.in.pom gsl-1.10/gsl-config.in
+--- gsl-1.10/gsl-config.in.pom	2008-02-19 12:42:10.000000000 +0100
++++ gsl-1.10/gsl-config.in	2008-02-19 12:46:39.000000000 +0100
+@@ -67,7 +67,7 @@ while test $# -gt 0; do
+        	;;
+ 
+     --libs-without-cblas)
+-       	echo @GSL_LIBS@ -lm
++	echo -lgsl -lm
+        	;;
+     *)
+ 	usage

gsl.spec

@@ -1,17 +1,19 @@
 Summary: The GNU Scientific Library for numerical analysis
 Name: gsl
 Version: 1.10
-Release: 2%{?dist}
+Release: 5%{?dist}
 URL: http://sources.redhat.com/gsl/
 Source: ftp://sources.redhat.com/pub/gsl/%{name}-%{version}.tar.gz
 Patch0: gsl-1.1-nousr.patch
 Patch1: gsl-1.10-lib64.patch
+Patch2: gsl-1.10-head.patch
 # info part of this package is under GFDL license
 # eigen/nonsymmv.c and eigen/schur.c
 # contains rutiens which are part of LAPACK - under BSD style license
 License: GPLv3 and GFDL and BSD license 
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: pkgconfig
 
 %description
 The GNU Scientific Library (GSL) is a collection of routines for
@@ -22,7 +24,8 @@ Summary: Static libraries and header files for GSL development
 Group: Development/Libraries
 Requires: gsl = %{version}-%{release}
 Requires(post): /sbin/install-info
-Requires(preun): /sbin/install-info 
+Requires(preun): /sbin/install-info
+Requires: pkgconfig
 
 %description devel
 
@@ -34,6 +37,7 @@ Library).
 %setup -q
 %patch0 -p1 -b .nousr
 %patch1 -p1 -b .lib64
+%patch2 -p1 -b .head
 
 %build
 %configure
@@ -46,9 +50,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 # remove unpackaged files from the buildroot
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-rm -rf $RPM_BUILD_ROOT%{_mandir}
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}
-rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig
 
 gslcsuffix=`echo "%{_libdir}" | sed s,/usr/,,`
 mv $RPM_BUILD_ROOT%{_bindir}/gsl-config $RPM_BUILD_ROOT%{_bindir}/gsl-config-$gslcsuffix
@@ -86,6 +88,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.la
 %{_bindir}/gsl-histogram
 %{_bindir}/gsl-randist
+%{_mandir}/man1/gsl-histogram.1*
+%{_mandir}/man1/gsl-randist.1*
 
 %files devel
 %defattr(-,root,root,-)
@@ -96,8 +100,20 @@ rm -rf $RPM_BUILD_ROOT
 %{_infodir}/*info*
 %{_libdir}/*.a
 %{_libdir}/*.so
+%{_libdir}/pkgconfig/gsl.pc
+%{_mandir}/man1/gsl-config.1*
+%{_mandir}/man3/*.3*
+
 
 %changelog
+* Wed Mar 19 2008 Ivana Varekova <varekova@redhat.com> - 1.10-5
+- add pkgconfig configure file (#437455)
+- add man pages
+
+* Tue Feb 19 2008 Ivana Varekova <varekova@redhat.com> - 1.10-4
+- Resolves: #433396
+  fix gsl-config output
+
 * Wed Sep 19 2007 Ivana Varekova <varekova@redhat.com> - 1.10-2
 - update license tag