rpms/ucblogo/F-10 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 ucblogo.spec, 1.11, 1.12

[Gérard Milmeister]

Author: gemi

Update of /cvs/pkgs/rpms/ucblogo/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5803/F-10

Modified Files:
	.cvsignore sources ucblogo.spec 
Log Message:
re-add emacs mode


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ucblogo/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Nov 2008 00:32:49 -0000	1.3
+++ .cvsignore	22 Nov 2008 15:08:03 -0000	1.4
@@ -1 +1,2 @@
 ucblogo-6.0.tar.gz
+logo-mode.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ucblogo/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Nov 2008 00:32:49 -0000	1.3
+++ sources	22 Nov 2008 15:08:04 -0000	1.4
@@ -1 +1,2 @@
 36a56765b18136c817880c5381af196b  ucblogo-6.0.tar.gz
+6dc3d37f7dfc885f0dc0d52b4f27f042  logo-mode.tar.gz


Index: ucblogo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ucblogo/F-10/ucblogo.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ucblogo.spec	21 Nov 2008 00:34:31 -0000	1.11
+++ ucblogo.spec	22 Nov 2008 15:08:04 -0000	1.12
@@ -6,11 +6,12 @@
 Group: 		Development/Languages
 License:	GPLv2+
 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
 URL: 		http://www.cs.berkeley.edu/~bh
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-#BuildRequires:	emacs
+BuildRequires:	emacs
 BuildRequires:	texinfo
 BuildRequires:	texinfo-tex
 BuildRequires:	texi2html
@@ -35,33 +36,41 @@
 continuation lines, first-class instruction and expression templates,
 and macros.
 
+%package emacs
+Summary:        Emacs Logo mode
+Group:          Development/Languages
+Requires:       %{name} = %{version}-%{release}
+
+%description emacs
+Emacs mode for UCBLogo.
+
 
 %prep
 %setup -q
+%setup -q -a 1
 %patch0 -p1 -b .ospeed
 %patch1 -p1 -b .wx
 
 sed -i 's|everything|all|g' makefile*
 
 # no dot files in directories
-# -pi -e 's|\.logo|dot.logo|g' emacs/dot.*
-#sed -i 's|/\.logo|/dot.logo|g' emacs/makefile
-#sed -i 's|\.LOOPS|dot.LOOPS|g' emacs/dot.*
-#sed -i 's|/\.LOOPS|/dot.LOOPS|g' emacs/makefile
+sed -i  's|\.logo|dot.logo|g' emacs/dot.*
+sed -i 's|/\.logo|/dot.logo|g' emacs/makefile
+sed -i 's|\.LOOPS|dot.LOOPS|g' emacs/dot.*
+sed -i 's|/\.LOOPS|/dot.LOOPS|g' emacs/makefile
 
 # correct directories /usr/lib -> /usr/share and /usr/local ->  /usr
-#sed -i 's|/local/lib/logo|/share/logo|g' emacs/*
+sed -i 's|/local/lib/logo|/share/logo|g' emacs/*
 sed -i 's|/local/lib/logo|/share/logo|g' *.c README
-#sed -i 's|/lib/logo|/share/logo|g' emacs/*
+sed -i 's|/lib/logo|/share/logo|g' emacs/*
 sed -i 's|/lib/logo|/share/logo|g' *.c makefile*
 sed -i 's|/usr/local/bin/logo|/usr/bin/logo|g' docs/html/usermanual_1.html
 sed -i 's|/usr/local/bin/logo|/usr/bin/logo|g' docs/ucblogo.info*
 sed -i 's|/usr/local/bin/logo|/usr/bin/logo|g' docs/usermanual.texi
 sed -i 's|/usr/local/bin/logo|/usr/bin/logo|g' README
-#sed -i 's|/usr/local/info|/usr/share/info|g' emacs/logo.el emacs/README
+sed -i 's|/usr/local/info|/usr/share/info|g' emacs/logo.el emacs/README
 sed -i 's|/usr/local/info|/usr/share/info|g' README
-#sed -i 's|/usr/info|/usr/share/info|g' emacs/dot.emacs
-#sed -i 's|\$\(prefix\)/info|/usr/share/info|' emacs/makefile
+sed -i 's|\$\(prefix\)/info|/usr/share/info|' emacs/makefile
 
 # use cursesw instead of curses
 #sed -i 's|lcurses|lcursesw|' configure
@@ -70,12 +79,16 @@
 find -name '.svn' | xargs rm -rf
 
 %build
+# build WX version
 %configure --x-includes=%{_includedir} --x-libraries=%{_libdir} --with-x --wx-enable --wx-config_path=/usr/bin/wx-config
 make %{_smp_mflags} logo
 mv logo logo-wx
+# build traditional version
 make clean
 %configure --x-includes=%{_includedir} --x-libraries=%{_libdir} --with-x
 make %{_smp_mflags}
+# compile emacs files
+make -C emacs BINDIR=%{_bindir} EMACSDIR=%{_datadir}/emacs/site-lisp/logo INFODIR=%{_infodir} LIBLOC=%{_datadir}/logo
 
 
 %install
@@ -83,16 +96,19 @@
 %makeinstall
 
 install -m0755 logo-wx ${RPM_BUILD_ROOT}%{_bindir}
-mkdir -p ${RPM_BUILD_ROOT}/%{_datadir}/info
-mv -f ${RPM_BUILD_ROOT}/%{_prefix}/info/* ${RPM_BUILD_ROOT}/%{_datadir}/info
-rm -fr ${RPM_BUILD_ROOT}/%{_prefix}/info
-
-#mkdir -p ${RPM_BUILD_ROOT}/%{_datadir}/emacs/site-lisp/site-start.d
-#cp -f ${RPM_BUILD_ROOT}/%{_datadir}/logo/emacs/dot.emacs ${RPM_BUILD_ROOT}/%{_datadir}/emacs/site-lisp/site-start.d/logo-mode.el
-rm -f ${RPM_BUILD_ROOT}/%{_bindir}/install-logo-mode
-#mkdir installdocs
-#mv -f ${RPM_BUILD_ROOT}/%{_datadir}/logo/docs/html installdocs
-rm -fr ${RPM_BUILD_ROOT}/%{_datadir}/logo/docs
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/info
+mv -f ${RPM_BUILD_ROOT}%{_prefix}/info/* ${RPM_BUILD_ROOT}%{_datadir}/info
+rm -fr ${RPM_BUILD_ROOT}%{_prefix}/info
+rm -fr ${RPM_BUILD_ROOT}%{_datadir}/logo/docs
+
+# install emacs files
+make -C emacs install BINDIR=${RPM_BUILD_ROOT}%{_bindir} EMACSDIR=${RPM_BUILD_ROOT}%{_datadir}/emacs/site-lisp/logo
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/emacs/site-lisp/site-start.d
+cp -f emacs/dot.emacs ${RPM_BUILD_ROOT}%{_datadir}/emacs/site-lisp/site-start.d/logo-mode.el
+rm -f ${RPM_BUILD_ROOT}%{_bindir}/install-logo-mode
+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}
@@ -117,16 +133,22 @@
 %{_bindir}/*
 %{_datadir}/logo
 %{_infodir}/*
-#%{_datadir}/emacs/site-lisp/site-start.d
+
+
+%files emacs
+%defattr(-,root,root,-)
+%doc emacs/README
+%{_datadir}/emacs/site-lisp/logo
+%{_datadir}/emacs/site-lisp/site-start.d
 
 
 %changelog
+* Sat Nov 22 2008 Gerard Milmeister <gemi at bluewin.ch> - 6.0-2
+- re-add emacs logo-mode from previous release as a separate package
+
 * Thu Nov 20 2008 Gerard Milmeister <gemi at bluewin.ch> - 6.0-1
 - new release 6.0
 
-* Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 5.5-11
-- fix license tag
-
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 5.5-10
 - Autorebuild for GCC 4.3