X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=source-highlight.spec;h=956256acebd8386dc3768c95ec37a38f345fe72d;hb=835cf0b;hp=585b60d7edb2d2ad7addade319f65f3fb767c33b;hpb=1a76038e729b7ad832135b1c8b20e5545707052a;p=packages%2Fsource-highlight.git

diff --git a/source-highlight.spec b/source-highlight.spec
index 585b60d..956256a 100644
--- a/source-highlight.spec
+++ b/source-highlight.spec
@@ -1,17 +1,18 @@
 Summary:	GNU Source Highlight
 Summary(pl.UTF-8):	Podświetlanie składni z projektu GNU
 Name:		source-highlight
-Version:	3.1.8
-Release:	6
+Version:	3.1.9
+Release:	3
 License:	GPL v3+
 Group:		Applications/Publishing
-Source0:	http://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz
-# Source0-md5:	3243470706ef5fefdc3e43b5306a4e41
+Source0:	https://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz
+# Source0-md5:	a51266164a537c97860d5d9664614dec
 Patch0:		%{name}-info.patch
 URL:		http://www.gnu.org/software/src-highlite/
 BuildRequires:	bison
 BuildRequires:	boost-devel >= 1.36.0
 BuildRequires:	flex
+BuildRequires:	help2man
 BuildRequires:	libstdc++-devel
 BuildRequires:	texinfo
 Requires:	%{name}-libs = %{version}-%{release}
@@ -88,6 +89,7 @@ source-highlight.
 %patch0 -p1
 
 %build
+export CXXFLAGS="%{rpmcxxflags} -std=c++14"
 %configure \
 	--with-boost-libdir=%{_libdir}
 %{__make}
@@ -99,11 +101,10 @@ install -d $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-%{__rm} -rf docdir-%{name}-%{version}
-%{__mv} -f $RPM_BUILD_ROOT%{_docdir}/%{name} docdir-%{name}-%{version}
-
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libsource-highlight.la
 
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -116,10 +117,15 @@ rm -rf $RPM_BUILD_ROOT
 %post	libs -p /sbin/ldconfig
 %postun	libs -p /sbin/ldconfig
 
+%post	devel -p /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
+
+%postun	devel -p /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
+
 %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
@@ -130,10 +136,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/check-regexp.1*
 %{_mandir}/man1/source-highlight.1*
 %{_mandir}/man1/source-highlight-settings.1*
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/*
+%{_datadir}/%{name}
 %{_infodir}/source-highlight.info*
-%{_infodir}/source-highlight-lib.info*
 
 %files libs
 %defattr(644,root,root,755)
@@ -145,6 +149,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libsource-highlight.so
 %{_includedir}/srchilite
 %{_pkgconfigdir}/source-highlight.pc
+%{_infodir}/source-highlight-lib.info*
 
 %files static
 %defattr(644,root,root,755)