X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=source-highlight.spec;h=edaa7a3834c5001a8e59cc5e9697aac3bbe23171;hb=7eb7ad6506d8c35282c4a69806f5d29997f588e1;hp=4170bbb186bb72800739eb9527ce2ffacb5e8cd8;hpb=d031e357e860481ed88323f2e8f51709975bb003;p=packages%2Fsource-highlight.git

diff --git a/source-highlight.spec b/source-highlight.spec
index 4170bbb..edaa7a3 100644
--- a/source-highlight.spec
+++ b/source-highlight.spec
@@ -1,15 +1,15 @@
 Summary:	GNU Source Highlight
 Summary(pl.UTF-8):	Podświetlanie składni z projektu GNU
 Name:		source-highlight
-Version:	3.1.4
-Release:	1
+Version:	3.1.8
+Release:	3
 License:	GPL v3+
 Group:		Applications/Publishing
 Source0:	http://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz
-# Source0-md5:	becf8292b84ece6b532b0f0c92b530ee
+# Source0-md5:	3243470706ef5fefdc3e43b5306a4e41
 Patch0:		%{name}-info.patch
 URL:		http://www.gnu.org/software/src-highlite/
-BuildRequires:	automake
+BuildRequires:	bison
 BuildRequires:	boost-devel >= 1.36.0
 BuildRequires:	flex
 BuildRequires:	libstdc++-devel
@@ -21,162 +21,36 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 This program, given a source file, produces a document with syntax
 highlighting.
 
-At the moment this package can handle:
-
-- Ada
-- Asm (new)
-- Applescript (new)
-- Awk (new)
-- Autoconf files
-- Bat (new)
-- Bib
-- Bison
-- C/C++
-- C#
-- Clipper (new)
-- Cobol (new)
-- Configuration files (generic)
-- Caml
-- Changelog
-- Css
-- D (new)
-- Diff
-- Erlang (new)
-- errors (compiler output) (new)
-- Flex
-- Fortran
-- GLSL
-- Haskell
-- Haxe
-- Html
-- ini files
-- Java
-- Javascript
-- KDE desktop files
-- Latex
-- Ldap files
-- Logtalk
-- Log files
-- lsm files (Linux Software Map)
-- Lua
-- Makefile
-- Manifest (new)
-- M4
-- ML
-- Oz
-- Pascal
-- Perl
-- pkg-config files
-- PHP
-- Postscript
-- Prolog
-- Properties files
-- Python
-- RPM Spec files
-- Ruby
-- Scala
-- Shell
-- S-Lang
-- Sql
-- Tcl
-- Texinfo
-- VBscript (new)
-- XML
-- XOrg conf files
-
-as source languages, and
-
-- HTML
-- XHTML
-- ANSI color escape sequences
-- LaTeX
-- Texinfo
-- DocBook
-
-
-as output formats.
+This package can handle many programming languages, e.g. C/C++, Flex,
+Java, PHP, Perl, Prolog, Python as source languages; and some output
+formats, e.g. HTML, XHTML, LaTeX.
 
 %description -l pl.UTF-8
 Ten program z pliku źródłowego tworzy dokument z podświetloną
 składnią.
 
-Aktualnie obsługiwane języki źródłowe to:
+Pakiet potrafi obsłużyć wiele języków programowania, np. C/C++, Flex,
+Java, PHP, Perl, Prolog, Python jako języki źródłowe; oraz kilka
+formatów wyjściowych, np. HTML, XHTML, LaTeX.
 
-- Ada
-- Asm (nowość)
-- Applescript (nowość)
-- Awk (nowość)
-- Autoconf files
-- Bat (nowość)
-- Bib
-- Bison
-- C/C++
-- C#
-- Clipper (nowość)
-- Cobol (nowość)
-- Configuration files (generic)
-- Caml
-- Changelog
-- Css
-- D (nowość)
-- Diff
-- Erlang (nowość)
-- errors (compiler output) (nowość)
-- Flex
-- Fortran
-- GLSL
-- Haskell
-- Haxe
-- Html
-- ini files
-- Java
-- Javascript
-- KDE desktop files
-- Latex
-- Ldap files
-- Logtalk
-- Log files
-- lsm files (Linux Software Map)
-- Lua
-- Makefile
-- Manifest (nowość)
-- M4
-- ML
-- Oz
-- Pascal
-- Perl
-- pkg-config files
-- PHP
-- Postscript
-- Prolog
-- Properties files
-- Python
-- RPM Spec files
-- Ruby
-- Scala
-- Shell
-- S-Lang
-- Sql
-- Tcl
-- Texinfo
-- VBscript (nowość)
-- XML
-- XOrg conf files
+%package libs
+Summary:	Source highlight library
+Summary(pl.UTF-8):	Biblioteka podświetlania składni
+Group:		Libraries
 
-a wynikiem może być:
+%description libs
+Source highlight library.
 
-- HTML
-- XHTML
-- ANSI color escape sequences
-- LaTeX
-- Texinfo
-- DocBook
+%description libs -l pl.UTF-8
+Biblioteka podświetlania składni.
 
 %package devel
 Summary:	Header file for srchlite library
 Summary(pl.UTF-8):	Plik nagłówkowy biblioteki srchlite
 Group:		Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
+Requires:	boost-devel >= 1.36.0
+Requires:	libstdc++-devel
 
 %description devel
 Header file for srchlite library.
@@ -184,17 +58,6 @@ Header file for srchlite library.
 %description devel -l pl.UTF-8
 Plik nagłówkowy biblioteki srchlite.
 
-%package libs
-Summary:	Source highlight library
-Summary(pl.UTF-8):	Biblioteka podświetlania składni
-Group:		Libraries
-
-%description libs
-Source highlight library.
-
-%description libs -l pl.UTF-8
-Biblioteka podświetlania składni.
-
 %package static
 Summary:	Static source-highlight library
 Summary(pl.UTF-8):	Statyczna biblioteka source-highlight
@@ -225,7 +88,6 @@ source-highlight.
 %patch0 -p1
 
 %build
-cp -f /usr/share/automake/config.sub .
 %configure \
 	--with-boost-libdir=%{_libdir}
 %{__make}
@@ -237,7 +99,10 @@ install -d $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-mv -f $RPM_BUILD_ROOT%{_docdir}/%{name}/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+%{__rm} -rf docdir-%{name}-%{version}
+%{__mv} -f $RPM_BUILD_ROOT%{_docdir}/%{name} docdir-%{name}-%{version}
+
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libsource-highlight.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -254,10 +119,12 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README THANKS TODO.txt doc/{*.css,*.html,*.java}
+%doc docdir-%{name}-%{version}/*
 %attr(755,root,root) %{_bindir}/check-regexp
 %attr(755,root,root) %{_bindir}/cpp2html
 %attr(755,root,root) %{_bindir}/java2html
 %attr(755,root,root) %{_bindir}/source-highlight
+%attr(755,root,root) %{_bindir}/source-highlight-esc.sh
 %attr(755,root,root) %{_bindir}/source-highlight-settings
 %attr(755,root,root) %{_bindir}/src-hilite-lesspipe.sh
 %{_mandir}/man1/check-regexp.1*
@@ -268,22 +135,21 @@ rm -rf $RPM_BUILD_ROOT
 %{_infodir}/source-highlight.info*
 %{_infodir}/source-highlight-lib.info*
 
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libsource-highlight.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libsource-highlight.so.4
+
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libsource-highlight.so
-%{_libdir}/libsource-highlight.la
 %{_includedir}/srchilite
 %{_pkgconfigdir}/source-highlight.pc
 
-%files libs
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libsource-highlight.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libsource-highlight.so.3
-
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libsource-highlight.a
 
 %files -n bash-completion-source-highlight
 %defattr(644,root,root,755)
-%{_sysconfdir}/bash_completion.d/*
+%{_sysconfdir}/bash_completion.d/source-highlight