Hello community, here is the log from the commit of package source-highlight for openSUSE:Factory checked in at 2015-03-18 13:08:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/source-highlight (Old) and /work/SRC/openSUSE:Factory/.source-highlight.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "source-highlight" Changes: -------- --- /work/SRC/openSUSE:Factory/source-highlight/source-highlight.changes 2014-03-31 20:45:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.source-highlight.new/source-highlight.changes 2015-03-18 13:08:53.000000000 +0100 @@ -1,0 +2,14 @@ +Wed Mar 18 07:48:00 UTC 2015 - [email protected] + +- Add baselibs.conf to sources + +------------------------------------------------------------------- +Tue Mar 17 16:58:03 UTC 2015 - [email protected] + +- Cleanup spec file with spec-cleaner +- Add gpg signature +- Use graphviz-gd instead of graphiz-gnome +- Disable build of static library +- Remove source-highlight-rpmlintrc + +------------------------------------------------------------------- Old: ---- source-highlight-rpmlintrc New: ---- source-highlight-3.1.7.tar.gz.sig source-highlight.keyring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ source-highlight.spec ++++++ --- /var/tmp/diff_new_pack.OS7ypR/_old 2015-03-18 13:08:54.000000000 +0100 +++ /var/tmp/diff_new_pack.OS7ypR/_new 2015-03-18 13:08:54.000000000 +0100 @@ -1,8 +1,7 @@ -# vim: set ts=4 sw=4 et: # # spec file for package source-highlight # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,42 +16,38 @@ # +%define soname 4 Name: source-highlight Version: 3.1.7 Release: 0 -%define soname 4 Summary: Source Code Highlighter with Support for Many Languages License: GPL-3.0 Group: Productivity/Publishing/Other -Source: ftp://ftp.gnu.org/gnu/src-highlite/source-highlight-%{version}.tar.gz -Source1: source-highlight-apache2.conf -Source99: %{name}-rpmlintrc -Patch2: source-highlight-doxygen_disable_timestamp_in_footer.patch Url: http://www.gnu.org/software/src-highlite -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: apache2 -BuildRequires: autoconf -BuildRequires: automake +Source0: ftp://ftp.gnu.org/gnu/src-highlite/source-highlight-%{version}.tar.gz +Source1: ftp://ftp.gnu.org/gnu/src-highlite/source-highlight-%{version}.tar.gz.sig +Source2: %{name}.keyring +Source3: baselibs.conf +Source4: source-highlight-apache2.conf +Patch2: source-highlight-doxygen_disable_timestamp_in_footer.patch BuildRequires: bison BuildRequires: boost-devel BuildRequires: ctags BuildRequires: doxygen BuildRequires: flex BuildRequires: gcc-c++ -BuildRequires: glibc-devel -BuildRequires: graphviz -BuildRequires: graphviz-gnome +BuildRequires: graphviz-gd BuildRequires: help2man BuildRequires: libicu-devel BuildRequires: libstdc++-devel BuildRequires: libtool -BuildRequires: make -BuildRequires: pkgconfig BuildRequires: texinfo +BuildRequires: pkg-config +PreReq: %{install_info_prereq} +BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} >= 1030 BuildRequires: fdupes %endif -PreReq: %install_info_prereq %description Source-highlight reads source language specifications dynamically, thus it can @@ -82,7 +77,8 @@ Summary: Source Code Highlighting C++ Library Group: Development/Libraries/C and C++ Requires: libsource-highlight%{soname} = %{version}-%{release} -PreReq: %install_info_prereq +# FIXME: use proper Requires(pre/post/preun/...) +PreReq: %{install_info_prereq} %description -n libsource-highlight-devel Source-highlight reads source language specifications dynamically, thus it can @@ -114,7 +110,7 @@ %prep %setup -q %patch2 -%__sed -i 's/\r//g' doc/*.css +sed -i 's/\r//g' doc/*.css %build BOOST_REGEX=$(/bin/ls -1 "%{_libdir}"/libboost_regex*mt*.so 2>/dev/null | head -1) @@ -130,25 +126,26 @@ %configure \ "$BOOST_REGEX_PARAM" \ --with-bash-completion="%{_sysconfdir}/bash_completion.d" \ - --with-doxygen + --with-doxygen \ + --enable-static=no -%__make %{?_smp_mflags} +make %{?_smp_mflags} -%__make %{?_smp_flags} -C src source-highlight-cgi +make %{?_smp_mflags} -C src source-highlight-cgi %install -%makeinstall +make DESTDIR=%{buildroot} install %{?_smp_mflags} -%__install -d "%{buildroot}/srv/source-highlight" +install -d "%{buildroot}/srv/source-highlight" libtool --mode=install install -m 0755 src/source-highlight-cgi "%{buildroot}/srv/source-highlight/source-highlight.cgi" -%__install -D -m0644 "%{SOURCE1}" "%{buildroot}/etc/apache2/conf.d/%{name}.conf" +install -D -m0644 "%{SOURCE4}" "%{buildroot}%{_sysconfdir}/apache2/conf.d/%{name}.conf" -%__rm "%{buildroot}%{_libdir}"/*.la +find %{buildroot} -type f -name "*.la" -delete -print -%__rm -rf "%{buildroot}%{_docdir}/%{name}/html" -%__rm -rf "%{buildroot}%{_datadir}/doc" +rm -rf "%{buildroot}%{_docdir}/%{name}/html" +rm -rf "%{buildroot}%{_datadir}/doc" -%__chmod 0644 AUTHORS ChangeLog COPYING CREDITS NEWS README THANKS TODO.txt +chmod 0644 AUTHORS ChangeLog COPYING CREDITS NEWS README THANKS TODO.txt %if 0%{?suse_version} >= 1030 %fdupes -s "%{buildroot}%{_datadir}/" @@ -167,24 +164,16 @@ %install_info_delete --info-dir="%{_infodir}" "%{_infodir}/source-highlight-lib".info%{ext_info} %post -n libsource-highlight%{soname} -p /sbin/ldconfig + %postun -n libsource-highlight%{soname} -p /sbin/ldconfig %files %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING CREDITS NEWS README THANKS TODO.txt %config %{_sysconfdir}/bash_completion.d/source-highlight -%{_bindir}/check-regexp -%{_bindir}/cpp2html -%{_bindir}/java2html -%{_bindir}/source-highlight -%{_bindir}/src-hilite-lesspipe.sh -%{_bindir}/source-highlight-esc.sh -%{_bindir}/source-highlight-settings -%dir %{_datadir}/source-highlight -%{_datadir}/source-highlight/* -%doc %{_mandir}/man1/check-regexp.1%{ext_man} -%doc %{_mandir}/man1/source-highlight.1%{ext_man} -%doc %{_mandir}/man1/source-highlight-settings.1%{ext_man} +%{_bindir}/* +%{_datadir}/source-highlight +%doc %{_mandir}/man1/*.1%{ext_man} %doc %{_infodir}/source-highlight.info%{ext_man} %files -n libsource-highlight%{soname} @@ -196,13 +185,14 @@ %defattr(-,root,root) %{_includedir}/srchilite %{_libdir}/libsource-highlight.so -%{_libdir}/libsource-highlight.a %{_libdir}/pkgconfig/source-highlight.pc %doc %{_infodir}/source-highlight-lib.info%{ext_info} %files cgi %defattr(-,root,root) -%config(noreplace) /etc/apache2/conf.d/source-highlight.conf +%config(noreplace) %{_sysconfdir}/apache2/conf.d/source-highlight.conf +%dir %{_sysconfdir}/apache2 +%dir %{_sysconfdir}/apache2/conf.d %dir /srv/source-highlight /srv/source-highlight/source-highlight.cgi -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
