- x32 rebuild

[packages/source-highlight.git] / source-highlight.spec

diff --git a/source-highlight.spec b/source-highlight.spec
index 4170bbb186bb72800739eb9527ce2ffacb5e8cd8..e4014b1301d9962fdac615daff7dca1ac9d2be77 100644 (file)
--- a/source-highlight.spec
+++ b/source-highlight.spec
@@ -1,12 +1,12 @@
 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.7
+Release:       9
 License:       GPL v3+
 Group:         Applications/Publishing
 Source0:       http://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz
-# Source0-md5: becf8292b84ece6b532b0f0c92b530ee
+# Source0-md5: 0ff81588d3536b4c4e571122ba940595
 Patch0:                %{name}-info.patch
 URL:           http://www.gnu.org/software/src-highlite/
 BuildRequires: automake
@@ -172,11 +172,24 @@ a wynikiem może być:
 - Texinfo
 - DocBook
 
+%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 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 +197,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
@@ -237,7 +239,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 +259,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 +275,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