rpms/squirrel/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 squirrel-autotools.patch, 1.1, 1.2 squirrel.spec, 1.3, 1.4

[Dan Horák]

Author: sharkcz

Update of /cvs/pkgs/rpms/squirrel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22042

Modified Files:
	.cvsignore sources squirrel-autotools.patch squirrel.spec 
Log Message:
* Wed Jul  1 2009 Dan Horák <dan[at]danny.cz> 2.2.3-1
- update to upstream version 2.2.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squirrel/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	14 Oct 2008 12:23:38 -0000	1.3
+++ .cvsignore	1 Jul 2009 12:59:44 -0000	1.4
@@ -1 +1 @@
-squirrel_2.2.2_stable_fixed.tar.gz
+squirrel_2.2.3_stable.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squirrel/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	14 Oct 2008 12:23:39 -0000	1.3
+++ sources	1 Jul 2009 12:59:44 -0000	1.4
@@ -1 +1 @@
-7c2842a8cc3ac4e2d63a74bcb59eaf02  squirrel_2.2.2_stable_fixed.tar.gz
+25295ed1459111a80f612357cfe83b54  squirrel_2.2.3_stable.tar.gz

squirrel-autotools.patch:

Index: squirrel-autotools.patch
===================================================================
RCS file: /cvs/pkgs/rpms/squirrel/devel/squirrel-autotools.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- squirrel-autotools.patch	1 Jun 2008 09:05:06 -0000	1.1
+++ squirrel-autotools.patch	1 Jul 2009 12:59:45 -0000	1.2
@@ -9,10 +9,10 @@ diff -Nru SQUIRREL2.orig/autogen.sh SQUI
 +  exit
 +fi
 +
-+libtoolize
++libtoolize --copy
 +aclocal
 +autoheader
-+automake --add-missing --foreign
++automake --add-missing --copy --foreign
 +autoconf
 diff -Nru SQUIRREL2.orig/configure.ac SQUIRREL2/configure.ac
 --- SQUIRREL2.orig/configure.ac	1970-01-01 01:00:00.000000000 +0100
@@ -20,7 +20,7 @@ diff -Nru SQUIRREL2.orig/configure.ac SQ
 @@ -0,0 +1,26 @@
 +## Bootstrap autoconf/automake
 +AC_PREREQ(2.59)
-+AC_INIT([squirrel], [2.2], [])
++AC_INIT([squirrel], [2.2.3], [])
 +AC_CANONICAL_TARGET
 +AC_CONFIG_SRCDIR([configure.ac])
 +AM_INIT_AUTOMAKE
@@ -181,12 +181,14 @@ diff -Nru SQUIRREL2.orig/sqstdlib/Makefi
 diff -Nru SQUIRREL2.orig/sqstdlib/Makefile.am SQUIRREL2/sqstdlib/Makefile.am
 --- SQUIRREL2.orig/sqstdlib/Makefile.am	1970-01-01 01:00:00.000000000 +0100
 +++ SQUIRREL2/sqstdlib/Makefile.am	2007-07-07 19:24:48.000000000 +0200
-@@ -0,0 +1,18 @@
+@@ -0,0 +1,20 @@
 +MAINTAINERCLEANFILES = Makefile.in
 +AM_CXXFLAGS = -fno-rtti
 +
 +lib_LTLIBRARIES = libsqstdlib.la
 +
++libsqstdlib_la_LDFLAGS = -release $(VERSION)
++
 +libsqstdlib_la_SOURCES = \
 +			sqstdaux.cpp \
 +			sqstdblob.cpp \
@@ -259,12 +261,14 @@ diff -Nru SQUIRREL2.orig/squirrel/Makefi
 diff -Nru SQUIRREL2.orig/squirrel/Makefile.am SQUIRREL2/squirrel/Makefile.am
 --- SQUIRREL2.orig/squirrel/Makefile.am	1970-01-01 01:00:00.000000000 +0100
 +++ SQUIRREL2/squirrel/Makefile.am	2007-07-07 19:03:05.000000000 +0200
-@@ -0,0 +1,36 @@
+@@ -0,0 +1,38 @@
 +MAINTAINERCLEANFILES = Makefile.in
 +AM_CXXFLAGS = -fno-rtti -Wall
 +
 +lib_LTLIBRARIES = libsquirrel.la
 +
++libsquirrel_la_LDFLAGS = -release $(VERSION)
++
 +libsquirrel_la_SOURCES = \
 +		sqapi.cpp \
 +		sqarray.h \


Index: squirrel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squirrel/devel/squirrel.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- squirrel.spec	26 Feb 2009 02:43:41 -0000	1.3
+++ squirrel.spec	1 Jul 2009 12:59:45 -0000	1.4
@@ -1,16 +1,12 @@
 Name:           squirrel
-Version:        2.2.2
-Release:        2%{?dist}
+Version:        2.2.3
+Release:        1%{?dist}
 Summary:        High level imperative/OO programming language
 
 Group:          Development/Tools
 License:        zlib
 URL:            http://squirrel-lang.org/
-#Source0:        http://downloads.sourceforge.net/%{name}/%{name}_%{version}_stable.tar.gz
-# upstream source archive contains 0000 as permisions for both files and dirs
-# fixed with "find . -type d -exec chmod 0755 {} \;"
-# and "find . -type f -exec chmod 0644 {} \;"
-Source0:        %{name}_%{version}_stable_fixed.tar.gz
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}_%{version}_stable.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:         squirrel-autotools.patch
 
@@ -38,7 +34,9 @@ Development files needed to use Squirrel
 
 
 %prep
-%setup -q -n SQUIRREL2
+%setup -q -c
+
+pushd SQUIRREL2
 %patch0 -p1
 
 # fix extension for autotools
@@ -52,16 +50,21 @@ do
 done
 
 sh autogen.sh
+popd
 
 
 %build
+pushd SQUIRREL2
 %configure --disable-static
 make %{?_smp_mflags}
+popd
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
+pushd SQUIRREL2
 make DESTDIR=$RPM_BUILD_ROOT INSTALL="/usr/bin/install -p" install
+popd
 
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
 
@@ -76,24 +79,27 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README HISTORY COPYRIGHT
+%doc SQUIRREL2/{README,HISTORY,COPYRIGHT}
 %{_bindir}/sq
 
 %files libs
 %defattr(-,root,root,-)
-%doc COPYRIGHT
-%{_libdir}/libsqstdlib.so.*
-%{_libdir}/libsquirrel.so.*
+%doc SQUIRREL2/COPYRIGHT
+%{_libdir}/libsqstdlib-%{version}.so
+%{_libdir}/libsquirrel-%{version}.so
 
 %files devel
 %defattr(-,root,root,-)
-%doc doc/*.pdf
+%doc SQUIRREL2/doc/*.pdf
 %{_includedir}/squirrel
 %{_libdir}/libsqstdlib.so
 %{_libdir}/libsquirrel.so
 
 
 %changelog
+* Wed Jul  1 2009 Dan Horák <dan[at]danny.cz> 2.2.3-1
+- update to upstream version 2.2.3
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild