- fix for texinfo 5.1

- install docs properly
- rel 4

diff --git a/source-highlight-info.patch b/source-highlight-info.patch
index bd228b6a6958c1a2550f6d37ddfe136f203500c7..89190b5fad376d994d28ddc6973d98907aa353e1 100644 (file)
--- a/source-highlight-info.patch
+++ b/source-highlight-info.patch
@@ -12,3 +12,23 @@
  @end direntry
  
  @titlepage
+--- source-highlight-3.1.7/doc/comment-show.show.texinfo.orig  2013-07-09 17:49:10.494647001 +0200
++++ source-highlight-3.1.7/doc/comment-show.show.texinfo       2013-07-09 17:50:06.605111340 +0200
+@@ -16,5 +16,4 @@
+   rule (string2) "<<" (exit level: 0, next: 4)
+     STATE 4 default: string2
+       rule (string2) ">>" (exit level: 1, next: 0)
+-
+-@end example
+\ No newline at end of file
++@end example
+--- source-highlight-3.1.7/doc/comment-show2.show.texinfo.orig 2013-07-09 17:49:16.271362496 +0200
++++ source-highlight-3.1.7/doc/comment-show2.show.texinfo      2013-07-09 17:50:10.645144430 +0200
+@@ -13,5 +13,4 @@
+     STATE 3 default: string2
+       rule (string2) ">>" (exit level: 1, next: 0)
+   rule (paren normal paren) "(\[)(.*)(\])" (exit level: 0, next: 0)
+-
+-@end example
+\ No newline at end of file
++@end example

diff --git a/source-highlight.spec b/source-highlight.spec
index b73b1c97b6da4aedafcd31c4768e3266694a7d14..db45be9d26cf8fee4c5c0001603a15457467c42f 100644 (file)
--- a/source-highlight.spec
+++ b/source-highlight.spec
@@ -2,7 +2,7 @@ Summary:        GNU Source Highlight
 Summary(pl.UTF-8):     Podświetlanie składni z projektu GNU
 Name:          source-highlight
 Version:       3.1.7
-Release:       3
+Release:       4
 License:       GPL v3+
 Group:         Applications/Publishing
 Source0:       http://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz
@@ -239,7 +239,9 @@ 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
@@ -257,6 +259,7 @@ 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