From 6cba391f4ce4c742f55bebfe7d7b880b7f087205 Mon Sep 17 00:00:00 2001 From: Ville Skyttä Date: Sep 17 2009 21:02:19 +0000 Subject: - Remaining improvements from #480288: - Add dependencies on libxslt and docbook-style-xsl. - Install dblatex style sheets. - Exclude unneeded *.py[co]. - Install python API. - Specfile cleanups. --- diff --git a/asciidoc-8.4.5-datadir.patch b/asciidoc-8.4.5-datadir.patch index b0d89ba..5e34ee2 100644 --- a/asciidoc-8.4.5-datadir.patch +++ b/asciidoc-8.4.5-datadir.patch @@ -1,6 +1,6 @@ diff -up asciidoc-8.4.5/asciidoc.py.datadir asciidoc-8.4.5/asciidoc.py ---- asciidoc-8.4.5/asciidoc.py.datadir 2009-07-18 14:48:29.000000000 -0400 -+++ asciidoc-8.4.5/asciidoc.py 2009-07-18 14:50:26.000000000 -0400 +--- asciidoc-8.4.5/asciidoc.py.datadir 2009-05-26 05:12:38.000000000 +0300 ++++ asciidoc-8.4.5/asciidoc.py 2009-09-08 00:25:23.000000000 +0300 @@ -651,6 +651,8 @@ def filter_lines(filter_cmd, lines, attr if not found: found = findfilter(filtername, CONF_DIR, cmd) @@ -19,8 +19,8 @@ diff -up asciidoc-8.4.5/asciidoc.py.datadir asciidoc-8.4.5/asciidoc.py # Globals diff -up asciidoc-8.4.5/Makefile.in.datadir asciidoc-8.4.5/Makefile.in ---- asciidoc-8.4.5/Makefile.in.datadir 2009-04-23 18:49:43.000000000 -0400 -+++ asciidoc-8.4.5/Makefile.in 2009-07-18 14:46:22.000000000 -0400 +--- asciidoc-8.4.5/Makefile.in.datadir 2009-04-24 01:49:43.000000000 +0300 ++++ asciidoc-8.4.5/Makefile.in 2009-09-08 00:28:23.000000000 +0300 @@ -23,6 +23,7 @@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -29,7 +29,39 @@ diff -up asciidoc-8.4.5/Makefile.in.datadir asciidoc-8.4.5/Makefile.in prog = asciidoc.py a2x progdir = $(bindir) -@@ -126,6 +127,13 @@ fixconfpath: +@@ -35,25 +36,26 @@ manpdir = $(mandir)/man1 + conf = $(wildcard *.conf) + confdir = $(ASCIIDOCCONF) + +-filtersdir = $(ASCIIDOCCONF)/filters ++filtersdir = $(ASCIIDOCDATA)/filters ++filtersconfdir = $(ASCIIDOCCONF)/filters + + codefilter = filters/code/code-filter.py + codefilterdir = $(filtersdir)/code + codefilterconf = filters/code/code-filter.conf +-codefilterconfdir = $(filtersdir)/code ++codefilterconfdir = $(filtersconfdir)/code + + graphvizfilter = filters/graphviz/graphviz2png.py + graphvizfilterdir = $(filtersdir)/graphviz + graphvizfilterconf = filters/graphviz/graphviz-filter.conf +-graphvizfilterconfdir = $(filtersdir)/graphviz ++graphvizfilterconfdir = $(filtersconfdir)/graphviz + + musicfilter = filters/music/music2png.py + musicfilterdir = $(filtersdir)/music + musicfilterconf = filters/music/music-filter.conf +-musicfilterconfdir = $(filtersdir)/music ++musicfilterconfdir = $(filtersconfdir)/music + + sourcefilterconf = filters/source/source-highlight-filter.conf +-sourcefilterconfdir = $(filtersdir)/source ++sourcefilterconfdir = $(filtersconfdir)/source + + docbook = $(wildcard docbook-xsl/*.xsl) + docbookdir = $(ASCIIDOCCONF)/docbook-xsl +@@ -126,6 +128,13 @@ fixconfpath: mv $$f.out $$f; \ done @@ -43,7 +75,7 @@ diff -up asciidoc-8.4.5/Makefile.in.datadir asciidoc-8.4.5/Makefile.in install-vim: @for d in $(DESTDIR)/$(vimdir) /etc/vim; do \ if ! test -d $$d; then continue; fi ; \ -@@ -145,7 +153,7 @@ uninstall-vim: +@@ -145,7 +154,7 @@ uninstall-vim: done diff --git a/asciidoc.spec b/asciidoc.spec index 3a940d1..aa0d08a 100644 --- a/asciidoc.spec +++ b/asciidoc.spec @@ -1,7 +1,9 @@ +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} + Summary: Text based document generation Name: asciidoc Version: 8.4.5 -Release: 3%{?dist} +Release: 4%{?dist} # The python code does not specify a version. # The javascript example code is GPLv2+. License: GPL+ and GPLv2+ @@ -12,7 +14,10 @@ Source0: http://www.methods.co.nz/asciidoc/%{name}-%{version}.tar.gz Patch0: asciidoc-8.4.5-datadir.patch # https://bugzilla.redhat.com/506953 Patch1: asciidoc-8.4.5-use-unsafe-mode-by-default.patch -Requires: python >= 2.3 +BuildRequires: python >= 2.4 +Requires: python >= 2.4 +Requires: docbook-style-xsl +Requires: libxslt BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -37,57 +42,27 @@ for file in CHANGELOG README; do done %build +%configure %install rm -rf %{buildroot} -# make directory structure -%{__install} -d \ - %{buildroot}%{_sysconfdir}/asciidoc/filters/code \ - %{buildroot}%{_sysconfdir}/asciidoc/filters/graphviz \ - %{buildroot}%{_sysconfdir}/asciidoc/filters/music \ - %{buildroot}%{_sysconfdir}/asciidoc/filters/source \ - %{buildroot}%{_datadir}/asciidoc/docbook-xsl \ - %{buildroot}%{_datadir}/asciidoc/stylesheets \ - %{buildroot}%{_datadir}/asciidoc/javascripts \ - %{buildroot}%{_datadir}/asciidoc/images/icons/callouts \ - %{buildroot}%{_datadir}/asciidoc/filters/code \ - %{buildroot}%{_datadir}/asciidoc/filters/graphviz \ - %{buildroot}%{_datadir}/asciidoc/filters/music \ - %{buildroot}%{_bindir} \ - %{buildroot}%{_mandir}/man1 - -# real conf data goes to sysconfdir, rest goes to datadir -%{__install} -m 0644 *.conf %{buildroot}%{_sysconfdir}/asciidoc -for filter in code graphviz music source ; do - %{__install} -p -m 0644 filters/$filter/*.conf \ - %{buildroot}%{_sysconfdir}/asciidoc/filters/$filter/ -done +make install DESTDIR=%{buildroot} -# filter scripts -for filter in code graphviz music ; do - %{__install} -p -m 0755 filters/$filter/*.py \ - %{buildroot}%{_datadir}/asciidoc/filters/$filter/ +# real conf data goes to sysconfdir, rest to datadir; symlinks so asciidoc works +for d in dblatex docbook-xsl images javascripts stylesheets ; do + mv %{buildroot}%{_sysconfdir}/asciidoc/$d \ + %{buildroot}%{_datadir}/asciidoc + ln -s %{_datadir}/asciidoc/$d %{buildroot}%{_sysconfdir}/asciidoc/ done -# symlinks so asciidoc works -ln -s %{_datadir}/asciidoc/docbook-xsl %{buildroot}%{_sysconfdir}/asciidoc/ -ln -s %{_datadir}/asciidoc/stylesheets %{buildroot}%{_sysconfdir}/asciidoc/ -ln -s %{_datadir}/asciidoc/javascripts %{buildroot}%{_sysconfdir}/asciidoc/ -ln -s %{_datadir}/asciidoc/images %{buildroot}%{_sysconfdir}/asciidoc/ - -# binaries -%{__install} -p asciidoc.py %{buildroot}%{_bindir}/asciidoc -%{__install} -p a2x %{buildroot}%{_bindir}/ +# Python API +install -Dpm 644 asciidocapi.py %{buildroot}%{python_sitelib}/asciidocapi.py -# manpages -%{__install} -m 0644 doc/*.1 %{buildroot}%{_mandir}/man1 +# Make it easier to %exclude these with both rpm < and >= 4.7 +for file in %{buildroot}{%{_bindir},%{_datadir}/asciidoc/filters/*}/*.py ; do + touch ${file}{c,o} +done -# ancillary data -%{__install} -p -m 0644 docbook-xsl/*.xsl %{buildroot}%{_datadir}/asciidoc/docbook-xsl -%{__install} -p -m 0644 stylesheets/*.css %{buildroot}%{_datadir}/asciidoc/stylesheets/ -%{__install} -p -m 0644 javascripts/*.js %{buildroot}%{_datadir}/asciidoc/javascripts -%{__install} -p -m 0644 images/icons/callouts/* %{buildroot}%{_datadir}/asciidoc/images/icons/callouts -%{__install} -p -m 0644 images/icons/{README,*.png} %{buildroot}%{_datadir}/asciidoc/images/icons %clean rm -rf %{buildroot} @@ -95,12 +70,23 @@ rm -rf %{buildroot} %files %defattr(-,root,root,0755) %config(noreplace) %{_sysconfdir}/asciidoc +%exclude %{_bindir}/*.py[co] %{_bindir}/* %{_mandir}/man1/* %{_datadir}/asciidoc/ +%exclude %{_datadir}/asciidoc/filters/*/*.py[co] +%{python_sitelib}/asciidocapi.py* %doc README BUGS CHANGELOG COPYRIGHT %changelog +* Tue Sep 8 2009 Ville Skyttä - 8.4.5-4 +- Remaining improvements from #480288: +- Add dependencies on libxslt and docbook-style-xsl. +- Install dblatex style sheets. +- Exclude unneeded *.py[co]. +- Install python API. +- Specfile cleanups. + * Thu Aug 13 2009 Todd Zullinger - 8.4.5-3 - Use 'unsafe' mode by default (bug 506953) - Install filter scripts in %%{_datadir}/asciidoc @@ -156,7 +142,6 @@ rm -rf %{buildroot} - use config and _sysconfdir * Wed Jun 29 2005 Terje Røsten - 7.0.1-1 - - 7.0.1 - Drop patch now upstream - Build as noarch (Petr Klíma)