Hello community, here is the log from the commit of package yodl for openSUSE:Factory checked in at 2013-01-17 11:08:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yodl (Old) and /work/SRC/openSUSE:Factory/.yodl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yodl", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/yodl/yodl.changes 2012-09-11 09:22:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yodl.new/yodl.changes 2013-01-17 13:18:12.000000000 +0100 @@ -1,0 +2,16 @@ +Mon Jan 14 13:32:37 UTC 2013 - [email protected] + +- Use %{optflags} + +------------------------------------------------------------------- +Wed Dec 12 11:26:07 UTC 2012 - [email protected] + +- Update to 3.00.0 + To get the pre-3.00.0 include behavior, use the -L + (--legacy-include) option + + 2.00.0 was a complete rewrite. See the manual for the modifications. + Old yodl-sources will usually require minor modifications + See /usr/share/doc/packages/yodl/CHANGES + +------------------------------------------------------------------- Old: ---- yodl-1.31.18-include-fix.diff yodl-1.31.18-strip.diff yodl-1.31.18.tar.gz yodl-python25.patch New: ---- fix-path.patch fix-tex-include.patch yodl_3.00.0.orig.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yodl.spec ++++++ --- /var/tmp/diff_new_pack.0WkhGM/_old 2013-01-17 13:18:13.000000000 +0100 +++ /var/tmp/diff_new_pack.0WkhGM/_new 2013-01-17 13:18:13.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package yodl # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,21 +19,26 @@ Name: yodl BuildRequires: bison BuildRequires: flex -BuildRequires: makeinfo -BuildRequires: python +BuildRequires: grep +BuildRequires: icmake +BuildRequires: sed BuildRequires: texlive-latex -Version: 1.31.18 +%if 0%{?suse_version} > 1220 +BuildRequires: texlive-bin +BuildRequires: tex(a4.sty) +BuildRequires: tex(epsf.sty) +%endif +Version: 3.00.0 Release: 0 Summary: Yet One-other Document Language -License: GPL-2.0+ +License: GPL-3.0 Group: Development/Tools/Doc Generators Url: http://yodl.sourceforge.net/ -Source: ftp://ftp.lilypond.org/pub/yodl/development/%{name}-%{version}.tar.gz -Patch: %{name}-%{version}-include-fix.diff -Patch1: %{name}-%{version}-strip.diff -Patch2: %{name}-python25.patch +Source: %{name}_%{version}.orig.tar.gz +Patch: fix-path.patch +Patch1: fix-tex-include.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-build -PreReq: %install_info_prereq %description YODL is a package that consists of programs, some shell scripts, and @@ -43,45 +48,36 @@ variety of other formats. In this purpose, YODL somewhat resembles generic markup languages. - - -Authors: --------- - Frank Brokken <[email protected]> - %prep %setup -q -%patch -%patch1 -%patch2 +%patch -p1 +%patch1 -p1 + +sed -i s,"#define COPT.*","#define COPT \"%{optflags}\"", ./build %build -CFLAGS="$RPM_OPT_FLAGS" \ -./configure --prefix=/usr --mandir=%{_mandir} --infodir=%{_infodir} -export PATH=$PATH:`pwd`/scripts/out -make -cd Documentation -make info +./build programs +./build man +./build manual +./build macros %install -export PATH=$PATH:`pwd`/scripts/out -make prefix=$RPM_BUILD_ROOT/usr mandir=$RPM_BUILD_ROOT/%{_mandir} infodir=$RPM_BUILD_ROOT/%{_infodir} install - -%clean -[ -d %{buildroot} -a "%{buildroot}" != "" ] && rm -rf %{buildroot} - -%post -%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz --entry="* yodl: (yodl). Provide a simple-to-use and extensible document language that can be used to convert documents in the YODL format to a variety of other formats." --section="Miscellaneous" - -%postun -%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz +cp -a tmp/install/* %{buildroot} +chmod +x %{buildroot}%{_bindir}/yodl2whatever +(cd %{buildroot}%{_bindir}; for i in html latex man ms sgml txt xml; do ln -s yodl2whatever yodl2$i; done) + +rm -f %{buildroot}%{_docdir}/yodl.dvi +rm -f %{buildroot}%{_docdir}/yodl.latex +rm -f %{buildroot}%{_docdir}/yodl.txt %files %defattr(-,root,root) -%doc ANNOUNCE.txt AUTHORS.txt README.txt CHANGES -%doc %{_infodir}/* -/usr/share/yodl/ -/usr/bin/* +%doc AUTHORS.txt changelog LICENSE README.txt CHANGES README.%{version} + +%{_bindir}/* +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/* + %doc %{_mandir}/man1/* %doc %{_mandir}/man7/* ++++++ fix-path.patch ++++++ diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile -x Makefile.in ../orig-yodl-3.00.0/INSTALL.im ./INSTALL.im --- ../orig-yodl-3.00.0/INSTALL.im 2010-11-08 15:50:48.000000000 +0100 +++ ./INSTALL.im 2012-12-12 10:57:07.036300748 +0100 @@ -63,8 +63,8 @@ BIN = BASE + "/bin"; SKEL = BASE + "/share/yodl"; MAN = BASE + "/share/man"; - DOC = BASE + "/share/doc/yodl"; - DOCDOC = BASE + "/share/doc/yodl-doc"; + DOC = BASE + "/share/doc/packages/yodl"; + DOCDOC = DOC; COMPILER = "gcc"; // COMPILER = "gcc-4.5"; diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile -x Makefile.in ../orig-yodl-3.00.0/scripts/hrefnotmpinstall ./scripts/hrefnotmpinstall --- ../orig-yodl-3.00.0/scripts/hrefnotmpinstall 2009-11-04 20:31:12.000000000 +0100 +++ ./scripts/hrefnotmpinstall 2012-12-12 11:17:09.424553063 +0100 @@ -1,9 +1,9 @@ #!/bin/bash -cd tmp/install/usr/share/doc/yodl-doc +cd tmp/install/usr/share/doc/packages/yodl for x in *html do - sed 's,href="tmp/install//usr/share/doc/yodl-doc/,href=",g' $x > $x.tmp + sed 's,href="tmp/install//usr/share/doc/packages/yodl/,href=",g' $x > $x.tmp mv $x.tmp $x done ++++++ fix-tex-include.patch ++++++ diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile -x Makefile.in ../orig-yodl-3.00.0/manual/yo/manual.yo ./manual/yo/manual.yo --- ../orig-yodl-3.00.0/manual/yo/manual.yo 2009-04-28 09:44:08.000000000 +0200 +++ ./manual/yo/manual.yo 2012-12-12 11:12:25.605177115 +0100 @@ -1,7 +1,7 @@ latexpackage()(a4,epsf) whenlatex(\ - SETSYMBOL(XXusexlatin)(NOTRANS(\input{../../yodl/xlatin1.tex})) + SETSYMBOL(XXusexlatin)(NOTRANS(\input{../../../yodl/xlatin1.tex})) ) SUBST(YODL)(tt(Yodl)) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
