Attachment 912216 Details for Bug 1107017 – Patch for rawhide

[patch] Patch for rawhide

0001-Fix-F21FTBFS.patch (text/plain), 3.48 KB, created by Yaakov Selkowitz on 2014-06-25 19:34:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yaakov Selkowitz

Created: 2014-06-25 19:34:22 UTC

Size: 3.48 KB

patch

obsolete

>From d0fec8ba7edba63140ce806abac8e1ba3fc4557d Mon Sep 17 00:00:00 2001
>From: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
>Date: Wed, 25 Jun 2014 14:29:59 -0500
>Subject: [PATCH] Fix F21FTBFS
>
>---
> ucblogo-6.0-no-texinfo.patch | 13 +++++++++++++
> ucblogo.spec                 | 17 ++++++++---------
> 2 files changed, 21 insertions(+), 9 deletions(-)
> create mode 100644 ucblogo-6.0-no-texinfo.patch
>
>diff --git a/ucblogo-6.0-no-texinfo.patch b/ucblogo-6.0-no-texinfo.patch
>new file mode 100644
>index 0000000..080fd6e
>--- /dev/null
>+++ b/ucblogo-6.0-no-texinfo.patch
>@@ -0,0 +1,13 @@
>+https://projects.archlinux.org/svntogit/community.git/tree/trunk?h=packages/ucblogo
>+
>+--- src/ucblogo-6.0/docs/makefile	2013-03-19 07:18:52.000000000 +0530
>++++ src/ucblogo-6.0-b/docs/makefile	2013-03-21 06:21:03.000000000 +0530
>+@@ -30,7 +30,7 @@
>+ ship:
>+ 	-rm -f *.{aux,cp,cps,dvi,fn,ky,log,pg,toc,tp,vr}
>+ 
>+-install: all
>++install:
>+ 	for d in $(INFODIR) $(DOCSDIR) $(HTMLDIR); do [ -d $$d ] || mkdir -p $$d || exit 1; done
>+ 	-cp -f *.info* $(INFODIR)/.
>+ 	-cp -f html/*.html $(HTMLDIR)/.
>diff --git a/ucblogo.spec b/ucblogo.spec
>index c8e1272..485ff7a 100644
>--- a/ucblogo.spec
>+++ b/ucblogo.spec
>@@ -1,6 +1,6 @@
> Name:		ucblogo
> Version:	6.0
>-Release:	13%{?dist}
>+Release:	14%{?dist}
> Summary:	An interpreter for the Logo programming language
> 
> Group: 		Development/Languages
>@@ -9,8 +9,8 @@ Source: 	ftp://ftp.cs.berkeley.edu/pub/ucblogo/ucblogo-%{version}.tar.gz
> Source1:        logo-mode.tar.gz
> Patch0:         ucblogo-5.5-ospeed.patch
> Patch1:         ucblogo-6.0-wx.patch
>+Patch2:         ucblogo-6.0-no-texinfo.patch
> URL: 		http://www.cs.berkeley.edu/~bh
>-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> BuildRequires:	emacs
> BuildRequires:	texinfo
> BuildRequires:	texinfo-tex
>@@ -50,6 +50,7 @@ Emacs mode for UCBLogo.
> %setup -q -a 1
> %patch0 -p1 -b .ospeed
> %patch1 -p1 -b .wx
>+%patch2 -p2 -b .texinfo
> 
> sed -i 's|everything|all|g' makefile*
> 
>@@ -76,6 +77,7 @@ sed -i 's|.*rmdir .*||' docs/makefile
> 
> find -name 'CVS' | xargs rm -rf
> find -name '.svn' | xargs rm -rf
>+rm -f config.cache config.status
> 
> 
> %build
>@@ -92,7 +94,6 @@ make -C emacs BINDIR=%{_bindir} EMACSDIR=%{_datadir}/emacs/site-lisp/logo INFODI
> 
> 
> %install
>-rm -rf ${RPM_BUILD_ROOT}
> %makeinstall
> 
> install -m0755 logo-wx ${RPM_BUILD_ROOT}%{_bindir}
>@@ -110,10 +111,6 @@ rm -f ${RPM_BUILD_ROOT}%{_datadir}/emacs/site-lisp/logo/README
> rm -f ${RPM_BUILD_ROOT}%{_datadir}/emacs/site-lisp/logo/*.el
> 
> 
>-%clean
>-rm -rf ${RPM_BUILD_ROOT}
>-
>-
> %post
> #/sbin/install-info %{_infodir}/loops.info --entry="* Loops: (loops).	Berkeley Logo Object Oriented Programming System." --section="Programming Languages" %{_infodir}/dir 2>/dev/null || :
> /sbin/install-info %{_infodir}/ucblogo.info --entry="* UCBLogo: (ucblogo).	Berkeley Logo User Manual." --section="Programming Languages"  %{_infodir}/dir 2>/dev/null || :
>@@ -127,7 +124,6 @@ fi
> 
> 
> %files
>-%defattr(-,root,root,-)
> %doc docs/html docs/usermanual.pdf README gpl plm changes.txt
> %doc 
> %{_bindir}/*
>@@ -136,13 +132,16 @@ fi
> 
> 
> %files emacs
>-%defattr(-,root,root,-)
> %doc emacs/README
> %{_datadir}/emacs/site-lisp/logo
> %{_datadir}/emacs/site-lisp/site-start.d
> 
> 
> %changelog
>+* Wed Jun 25 2014 Yaakov Selkowitz <yselkowi@redhat.com> - 6.0-14
>+- Remove stale configure remnants (#992830)
>+- Skip rebuilding of texinfo
>+
> * Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.0-13
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
> 
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1107017: 905845 | 905846 | 905847 | 912216