rpms/libstroke/EL-6 libstroke-automake-typos.patch, NONE, 1.1 libstroke.spec, 1.14, 1.15 libstroke-multilib.patch, 1.1, NONE

[Adam Goode]

Author: agoode

Update of /cvs/pkgs/rpms/libstroke/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv24702

Modified Files:
	libstroke.spec 
Added Files:
	libstroke-automake-typos.patch 
Removed Files:
	libstroke-multilib.patch 
Log Message:
* Tue Jul 27 2010 Adam Goode <adam at spicenitz.org> - 0.5.1-24
- Run automake at build time to remove various fragile workarounds
- -22 and -23 don't have changelog entries, I think those were mass rebuilds


libstroke-automake-typos.patch:
 libgstroke/Makefile.am |    2 --
 libstroke/Makefile.am  |    5 -----
 2 files changed, 7 deletions(-)

--- NEW FILE libstroke-automake-typos.patch ---
diff -ur libstroke-0.5.1~/libgstroke/Makefile.am libstroke-0.5.1/libgstroke/Makefile.am
--- libstroke-0.5.1~/libgstroke/Makefile.am	2001-05-25 18:00:12.000000000 -0400
+++ libstroke-0.5.1/libgstroke/Makefile.am	2010-07-27 09:59:34.469354294 -0400
@@ -21,8 +21,6 @@
 INCLUDES = @GTK_CFLAGS@
 LDADD    = @GTK_LIBS@
 
-EXTRA_DIST = 
-
 MOSTLYCLEANFILES = core *~ 
 CLEANFILES = core *~ 
 DISTCLEANFILES = core *~ 
diff -ur libstroke-0.5.1~/libstroke/Makefile.am libstroke-0.5.1/libstroke/Makefile.am
--- libstroke-0.5.1~/libstroke/Makefile.am	2001-05-07 20:05:43.000000000 -0400
+++ libstroke-0.5.1/libstroke/Makefile.am	2010-07-27 10:00:04.054477857 -0400
@@ -7,9 +7,6 @@
 
 EXTRA_DIST = 
 
-#tclpath::
-	#echo ${ENABLE_TCL}
-
 #if ENABLE_TCL
 #SEL_BIB = libstroke.la libstroke_tcl.la
 #else
@@ -35,8 +32,6 @@
 
 INCLUDES = -I$(top_srcdir)/libstroke @X_CFLAGS@  
 
-EXTRA_DIST = 
-
 MOSTLYCLEANFILES = core *~ 
 CLEANFILES = core *~ 
 DISTCLEANFILES = core *~ 


Index: libstroke.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libstroke/EL-6/libstroke.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- libstroke.spec	25 Jul 2009 08:42:26 -0000	1.14
+++ libstroke.spec	27 Jul 2010 15:25:57 -0000	1.15
@@ -1,6 +1,6 @@
 Name:              libstroke
 Version:           0.5.1
-Release:           23%{?dist}
+Release:           24%{?dist}
 
 Summary:           A stroke interface library
 License:           GPLv2
@@ -8,17 +8,16 @@ Url:               http://www.etla.net/%
 
 Source:            http://www.etla.net/%{name}/%{name}-%{version}.tar.gz
 Group:             System Environment/Libraries
-BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:     gtk+-devel
-BuildRequires:     libtool
+BuildRequires:     libtool automake autoconf
 BuildRequires:     pkgconfig
 
 Requires(post):    /sbin/ldconfig
 Requires(postun):  /sbin/ldconfig
 
 Patch0:            libstroke-aclocal.patch
-Patch1:            libstroke-multilib.patch
+Patch1:            libstroke-automake-typos.patch
 
 
 %description
@@ -67,16 +66,9 @@ Java interface for stroke and example ap
 %setup -q
 
 %patch0 -p1 -b .aclocal
-%patch1 -p1 -b .multilib
+%patch1 -p1 -b .automake-typos
 
-# fix RHBZ # 465030
-%if 0%{?fedora} < 11
-cp -p %{_datadir}/libtool/config.sub .
-cp -p %{_datadir}/libtool/config.guess .
-%else
-cp -p %{_datadir}/libtool/config/config.sub .
-cp -p %{_datadir}/libtool/config/config.guess .
-%endif
+autoreconf -if
 
 %build
 %configure \
@@ -85,7 +77,6 @@ cp -p %{_datadir}/libtool/config/config.
 make %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
 make INSTALL="%{__install} -p" install DESTDIR=%{buildroot}
 
 mkdir -p %{buildroot}%{_datadir}/stroke/java
@@ -138,7 +129,11 @@ rm -rf %{buildroot}
 %postun -p /sbin/ldconfig
 
 
-%Changelog
+%changelog
+* Tue Jul 27 2010 Adam Goode <adam at spicenitz.org> - 0.5.1-24
+- Run automake at build time to remove various fragile workarounds
+- -22 and -23 don't have changelog entries, I think those were mass rebuilds
+
 * Mon Dec 29 2008 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.5.1-21
 - fix for EL-5 build; pdgconfig as BR
 
@@ -204,4 +199,4 @@ rm -rf %{buildroot}
 - libstroke-gnome splited.
 
 * Wed Dec 19 2001 Wojciech Kazubski <wk at ire.pw.edu.pl>
-- first RedHat version.
\ No newline at end of file
+- first RedHat version.


--- libstroke-multilib.patch DELETED ---