rpms/rrdtool/FC-5 rrdtool-1.0.50-config.patch, NONE, 1.1 rrdtool.spec, 1.11, 1.12

[Jarod Wilson (jwilson)]

Author: jwilson

Update of /cvs/extras/rpms/rrdtool/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16587

Modified Files:
	rrdtool.spec 
Added Files:
	rrdtool-1.0.50-config.patch 
Log Message:
Update to 1.0.50

rrdtool-1.0.50-config.patch:

--- NEW FILE rrdtool-1.0.50-config.patch ---
diff -ur rrdtool-1.0.50-orig/config/ltmain.sh rrdtool-1.0.50/config/ltmain.sh
--- rrdtool-1.0.50-orig/config/ltmain.sh	2005-04-25 16:47:24.000000000 -0400
+++ rrdtool-1.0.50/config/ltmain.sh	2006-06-02 15:47:31.000000000 -0400
@@ -3005,7 +3005,7 @@
       case $outputname in
       lib*)
 	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-	eval shared_ext=\"$shrext_cmds\"
+	eval shared_ext=\"$shrext\"
 	eval libname=\"$libname_spec\"
 	;;
       *)
@@ -3017,7 +3017,7 @@
 	if test "$need_lib_prefix" != no; then
 	  # Add the "lib" prefix for modules if required
 	  name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-	  eval shared_ext=\"$shrext_cmds\"
+	  eval shared_ext=\"$shrext\"
 	  eval libname=\"$libname_spec\"
 	else
 	  libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
@@ -3779,7 +3779,7 @@
 	fi
 
 	# Get the real and link names of the library.
-	eval shared_ext=\"$shrext_cmds\"
+	eval shared_ext=\"$shrext\"
 	eval library_names=\"$library_names_spec\"
 	set dummy $library_names
 	realname="$2"
Only in rrdtool-1.0.50/config: ltmain.sh.orig
Only in rrdtool-1.0.50-orig: configure.orig
diff -ur rrdtool-1.0.50-orig/Makefile.in rrdtool-1.0.50/Makefile.in
--- rrdtool-1.0.50-orig/Makefile.in	2006-06-02 15:51:08.000000000 -0400
+++ rrdtool-1.0.50/Makefile.in	2006-06-02 15:47:31.000000000 -0400
@@ -703,8 +703,8 @@
 # mac os X has its perl module in bundles so it seems
 install-data-local:
 	@if test "x$(PERL)" != "xno"; then \
-	  echo "$(top_srcdir)/config/mkinstalldirs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs"; \
-	  $(top_srcdir)/config/mkinstalldirs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs; \
+	  echo "$(mkinstalldirs) $(DESTDIR)$(prefix)/lib/perl/auto/RRDs"; \
+	  $(mkinstalldirs) $(DESTDIR)$(prefix)/lib/perl/auto/RRDs; \
 	  echo "$(INSTALL) -m 644 $(top_srcdir)/perl-piped/RRDp.pm $(DESTDIR)$(prefix)/lib/perl"; \
 	  $(INSTALL) -m 644 $(top_srcdir)/perl-piped/RRDp.pm $(DESTDIR)$(prefix)/lib/perl; \
 	  echo "$(INSTALL) -m 644 $(top_srcdir)/perl-shared/RRDs.pm $(DESTDIR)$(prefix)/lib/perl"; \
Only in rrdtool-1.0.50-orig: Makefile.in.orig


Index: rrdtool.spec
===================================================================
RCS file: /cvs/extras/rpms/rrdtool/FC-5/rrdtool.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- rrdtool.spec	2 Jun 2006 16:55:49 -0000	1.11
+++ rrdtool.spec	2 Jun 2006 20:01:07 -0000	1.12
@@ -2,14 +2,15 @@
 
 Summary: Round Robin Database Tool to store and display time-series data
 Name: rrdtool
-Version: 1.0.49
-Release: 6%{?dist}
+Version: 1.0.50
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Databases
 URL: http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/
 Source: http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/rrdtool-1.0.x/rrdtool-%{version}.tar.gz
 Patch0: rrdtool-1.0.49-php_config.patch
 Patch1: rrdtool-1.0.49-fc4.patch
+Patch2: rrdtool-1.0.50-config.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gcc-c++, php-devel >= 4.0, openssl-devel
 BuildRequires: libpng-devel, zlib-devel
@@ -49,12 +50,12 @@
 %setup
 %patch0 -p0 -b .phpfix
 %patch1 -p1 -b .fc4
+%patch2 -p1 -b .config
 
 # Fixes to /usr/lib(64) for x86_64
 %{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g' \
     configure contrib/php4/configure Makefile.in
 
-
 %build
 %configure \
     --program-prefix="%{?_program_prefix}" \
@@ -62,6 +63,7 @@
     --enable-local-libpng \
     --enable-local-zlib \
     --with-pic
+
 %{__make} %{?_smp_mflags}
 
 # Build the php4 module, the tmp install is required
@@ -80,7 +82,6 @@
 find examples/ -name "*.pl" \
     -exec %{__perl} -pi -e 's|\015||gi' {} \;
 
-
 %install
 %{__rm} -rf %{buildroot}
 %makeinstall
@@ -149,6 +150,9 @@
 
 
 %changelog
+* Fri Jun 02 2006 Jarod Wilson <jwilson at redhat.com> 1.0.50-1
+- Update to 1.0.50
+
 * Fri Jun 02 2006 Jarod Wilson <jwilson at redhat.com> 1.0.49-6
 - Rebuild for FC5