Hello community, here is the log from the commit of package webdot for openSUSE:Factory checked in at 2020-12-05 20:51:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/webdot (Old) and /work/SRC/openSUSE:Factory/.webdot.new.5913 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "webdot" Sat Dec 5 20:51:22 2020 rev:19 rq:853289 version:2.30 Changes: -------- --- /work/SRC/openSUSE:Factory/webdot/webdot.changes 2013-12-09 07:27:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.webdot.new.5913/webdot.changes 2020-12-05 20:51:23.427566812 +0100 @@ -1,0 +2,6 @@ +Tue Dec 1 13:47:35 UTC 2020 - [email protected] + +- use system apache rpm macros +- run spec-cleaner + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ webdot.spec ++++++ --- /var/tmp/diff_new_pack.I2HbfF/_old 2020-12-05 20:51:24.167567523 +0100 +++ /var/tmp/diff_new_pack.I2HbfF/_new 2020-12-05 20:51:24.167567523 +0100 @@ -1,7 +1,7 @@ # # spec file for package webdot # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,11 +12,25 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # +%define cgibindir %{apache_serverroot}/cgi-bin +%define htmldir %{apache_serverroot}/htdocs +%define httpdconf %(rpm -ql apache2 | grep '/uid\\\.conf$') +%define cachedir %{_localstatedir}/cache/webdot +%define tclsh83bin %(rpm -ql tcl | grep '/tclsh$') Name: webdot +Version: 2.30 +Release: 0 +Summary: A CGI graph server script that uses tcldot from graphviz +License: BSD-3-Clause +Group: Productivity/Graphics/Visualization/Graph +URL: https://www.graphviz.org/ +Source: http://www.graphviz.org/pub/graphviz/stable/SOURCES//%{name}-%{version}.tar.gz +Patch1: rpm-specifics.diff +BuildRequires: apache-rpm-macros BuildRequires: apache2-devel BuildRequires: ghostscript-fonts-std BuildRequires: ghostscript-library @@ -24,63 +38,42 @@ BuildRequires: libapr-util1-devel BuildRequires: perl-GD BuildRequires: tcl-devel -Version: 2.30 -Release: 0 Requires: ghostscript Requires: http_daemon -Summary: A CGI graph server script that uses tcldot from graphviz -License: BSD-3-Clause -Group: Productivity/Graphics/Visualization/Graph -Source: http://www.graphviz.org/pub/graphviz/stable/SOURCES//%{name}-%{version}.tar.gz -Patch1: rpm-specifics.diff -Url: http://www.graphviz.org/ +# FIXME: use proper Requires(pre/post/preun/...) +PreReq: filesystem +PreReq: fileutils BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -PreReq: filesystem fileutils -%define apache_serverroot %(/usr/sbin/apxs2 -q datadir 2>/dev/null || /usr/sbin/apxs -q PREFIX) -%define cgibindir %apache_serverroot/cgi-bin -%define htmldir %apache_serverroot/htdocs -%define httpdconf %(rpm -ql apache2 | grep '/uid\\\.conf$') -%define apacheuser %(grep -i '^user ' %{httpdconf} | awk '{print $2}') -%define apachegroup nogroup -%define cachedir /var/cache/webdot -%define tclsh83bin %(rpm -ql tcl | grep '/tclsh$') %description A cgi-bin program that produces clickable graphs in web pages when provided with an href to a .dot file. Uses Tcldot from the graphviz rpm. By default, only requests from localhost are served. - - -Authors: --------- - John Ellson <[email protected]> - %prep -%setup -q -n %{name}-%{version} +%setup -q %patch1 -p1 %build %install make install \ - DESTDIR=$RPM_BUILD_ROOT \ + DESTDIR=%{buildroot} \ BUILD_DIR=. \ CGI-BIN_DIR=%{cgibindir} \ HTML_DIR=%{htmldir} \ - CACHE_DIR=/var/cache \ - HTTPD-USER-GROUP=%apacheuser:%apachegroup \ - TCLSH_EXECUTABLE=%tclsh83bin \ + CACHE_DIR=%{_localstatedir}/cache \ + HTTPD-USER-GROUP=%{apache_user}:%apache_group \ + TCLSH_EXECUTABLE=%{tclsh83bin} \ GS=%(which gs) \ PS2EPSI=%(which ps2epsi) -rm -f $RPM_BUILD_ROOT%{cgibindir}/webdot.tcl +rm -f %{buildroot}%{cgibindir}/webdot.tcl %files -%defattr(-,root,root) -%doc COPYING README AUTHORS CHANGES +%license COPYING +%doc README AUTHORS CHANGES %attr(755,root,root) %{cgibindir}/webdot %attr(-,root,root) %{htmldir}/webdot/ -%attr(700,%{apacheuser},%{apachegroup}) %{cachedir}/ +%attr(700,%{apache_user},%{apache_group}) %{cachedir}/ %changelog _______________________________________________ openSUSE Commits mailing list -- [email protected] To unsubscribe, email [email protected] List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/[email protected]
