rpms/lyx/devel lyx-1.6.4-autoconf_2.64.patch, NONE, 1.1 lyx.spec, 1.101, 1.102

[José Abílio Oliveira Matos]

Author: jamatos

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

Modified Files:
	lyx.spec 
Added Files:
	lyx-1.6.4-autoconf_2.64.patch 
Log Message:
* Thu Nov 19 2009 José Matos <jamatos at fc.up.pt> - 1.6.4-3
- LyX supports autoconf 2.64 (should be upstream for 1.6.5)


lyx-1.6.4-autoconf_2.64.patch:
 autogen.sh |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE lyx-1.6.4-autoconf_2.64.patch ---
--- lyx-1.6.4/autogen.sh.ac_264	2009-07-13 15:40:46.000000000 +0100
+++ lyx-1.6.4/autogen.sh	2009-11-19 21:05:31.302688469 +0000
@@ -38,11 +38,11 @@
 
 
 case $autoversion in
-    *' '2.59[cd]|*' '2.60[ab]|*' '2.6[0-3])
+    *' '2.59[cd]|*' '2.60[ab]|*' '2.6[0-4])
 	;;
     *)
 	echo "This autoconf version is not supported by LyX."
-	echo "LyX only supports autoconf 2.59c-2.63."
+	echo "LyX only supports autoconf 2.59c-2.64."
 	exit 1
 	;;
 esac


Index: lyx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- lyx.spec	26 Oct 2009 03:15:20 -0000	1.101
+++ lyx.spec	19 Nov 2009 21:12:42 -0000	1.102
@@ -11,7 +11,7 @@
 %global fontname lyx
 %global common_desc \
 A collection of Math symbol fonts.
-#if 0%{?fedora} > 8 
+#if 0%{?fedora} > 8
 %if 0
 %define fontpackages 1
 BuildRequires: fontpackages-devel
@@ -24,7 +24,7 @@ BuildRequires: fontpackages-devel
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
 Version: 1.6.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2+
 Group: 	 Applications/Publishing
@@ -34,7 +34,7 @@ Source0: ftp://ftp.devel.lyx.org/pub/lyx
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: lyx-1.6.4-xdg_open.patch
-
+Patch2: lyx-1.6.4-autoconf_2.64.patch
 ## upstreamed patches
 # http://bugzilla.redhat.com/524046 , http://www.lyx.org/trc/ticket/6226
 Patch50: lyx-1.6.4-enchant.patch
@@ -60,9 +60,9 @@ BuildRequires: zlib-devel
 # optional minimal qt4 dep
 %{?_qt_version:Requires: qt4 >= %{_qt4_version}}
 
-Obsoletes: %{name}-qt < 1.5.0 
+Obsoletes: %{name}-qt < 1.5.0
 Provides:  %{name}-qt = %{version}-%{release}
-Obsoletes: %{name}-xforms < 1.5.0 
+Obsoletes: %{name}-xforms < 1.5.0
 
 Requires: %{name}-common = %{version}-%{release}
 
@@ -119,11 +119,11 @@ With LyX, the author can concentrate on 
 and let the computer take care of the rest.
 
 %package common
-Summary:  Common files of %{name} 
+Summary:  Common files of %{name}
 Group:    Applications/Publishing
 Requires: %{name} = %{version}-%{release}
 %{?build_noarch}
-%description common 
+%description common
 {summary}.
 
 %package -n %{fontname}-fonts-compat
@@ -246,6 +246,8 @@ Requires: %{fontname}-fonts-common = %{v
 %setup -q -n %{name}-%{version}%{?pre}
 
 %patch1 -p1 -b .xdg_open
+%patch2 -p1 -b .autoconf_2.64
+
 %patch50 -p1 -b .enchant
 
 # needed by patch50
@@ -312,7 +314,7 @@ touch --no-create %{_datadir}/icons/hico
 
 %postun common
 if [ $1 -eq 0 ] ; then
-  texhash >& /dev/null 
+  texhash >& /dev/null
   update-desktop-database -q &> /dev/null
   touch --no-create %{_datadir}/icons/hicolor &> /dev/null
   gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
@@ -341,7 +343,7 @@ fi
 rm -rf %{buildroot}
 
 
-%files 
+%files
 %defattr(-,root,root,-)
 %doc ANNOUNCE COPYING lib/CREDITS NEWS README
 %{_bindir}/*
@@ -446,6 +448,9 @@ fc-cache %{_fontdir} 2> /dev/null ||:
 
 
 %changelog
+* Thu Nov 19 2009 José Matos <jamatos at fc.up.pt> - 1.6.4-3
+- LyX supports autoconf 2.64 (should be upstream for 1.6.5)
+
 * Thu Sep 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.6.4-2
 - use enchant instead of aspell (#524046)