Hello community,

here is the log from the commit of package sarg for openSUSE:Factory checked in 
at 2017-06-16 10:54:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sarg (Old)
 and      /work/SRC/openSUSE:Factory/.sarg.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "sarg"

Fri Jun 16 10:54:49 2017 rev:32 rq:503968 version:2.3.10

Changes:
--------
--- /work/SRC/openSUSE:Factory/sarg/sarg.changes        2015-12-23 
08:49:40.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.sarg.new/sarg.changes   2017-06-16 
10:54:51.658843503 +0200
@@ -1,0 +2,8 @@
+Thu Jun 15 13:05:08 UTC 2017 - tchva...@suse.com
+
+- Remove apache2 dependency as it was only for directory ownership
+- Add patch sarg-no-werror.patch to not build with Werror
+- Cleanup a bit with spec-cleaner
+- Remove patch sarg-reports-english.patch which was applied by upstream
+
+-------------------------------------------------------------------

Old:
----
  sarg-reports-english.patch

New:
----
  sarg-no-werror.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ sarg.spec ++++++
--- /var/tmp/diff_new_pack.ZjwbdH/_old  2017-06-16 10:54:52.642705001 +0200
+++ /var/tmp/diff_new_pack.ZjwbdH/_new  2017-06-16 10:54:52.646704438 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package sarg
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -34,26 +34,20 @@
 Source8:        sarg-reports.1.gz
 Source9:        sarg-apache.conf
 Source10:       platform_suse.gif
-# Patch0:       http://sarg.sourceforge.net/sarg-2.0.1-largeurl.patch.gz
 # PATCH-FIX-UPSTREAM sarg-2.3.1-config.patch
 Patch0:         sarg-2.3.1-config.patch
 Patch1:         sarg-2.3.2-limits_h.diff
-# PATCH-FIX-UPSTREAM sarg-reports-english.patch
-Patch10:        sarg-reports-english.patch
-PreReq:         %fillup_prereq
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%if 0%{suse_version}
-BuildRequires:  apache2
+# PATCH-FIX-OPENSUSE do not build with werror
+Patch2:         sarg-no-werror.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  gd-devel
 BuildRequires:  libtool
 BuildRequires:  pcre-devel
-%endif
-%if 0%{?suse_version} >= 1010
+BuildRequires:  openldap2-devel
+Requires(post): %fillup_prereq
 Recommends:     cron
 Recommends:     http_proxy
-%endif
 
 %description
 Sarg -- Squid Analysis Report Generator is a tool that allows you to
@@ -65,47 +59,42 @@
 %setup -q
 %patch0
 %patch1
-%{__patch} %{SOURCE2} < %{PATCH10}
+%patch2 -p1
+cp %{SOURCE2} .
 
 %build
-%{__chmod} a+x configure
-%{__chmod} a+x user_limit_block
+chmod a+x user_limit_block
 # gettext in soruce < gettext in distro
-%if 0%{?suse_version} > 1310
 sed -i -e 
's|AM_GNU_GETTEXT_VERSION(\[0.18\])|AM_GNU_GETTEXT_VERSION(\[0.19\])|g' 
configure.in
-cp /usr/share/gettext/po/Makefile.in.in po
-%endif
-autoreconf -fi
+cp %{_datadir}/gettext/po/Makefile.in.in po
+autoreconf -fvi
 %configure \
         --sysconfdir=%{_datadir}/%{name} \
         --mandir=%{_mandir}/ \
         --localedir=%{_datadir}/sarg/languages \
         --enable-sargphp=/srv/www/htdocs
-%if 0%{?suse_version} == 1110 || 0%{?sles_version} == 1000
-C_FLAGS=-std=c99
-%endif
-%{__make} %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
-%{__install} -d  %{buildroot}/srv/www/htdocs
-%makeinstall
-%{__install} -d  %{buildroot}%{_sysconfdir}/apache2/conf.d
-%{__install} -d  %{buildroot}/srv/www/sarg
-%{__install} -d  %{buildroot}%{_datadir}/%{name}/languages
-%{__install} -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/sarg.conf
-%{__install} -m 644 %{SOURCE9} %{buildroot}%{_sysconfdir}/apache2/conf.d/
-%{__install} -m 644 %{SOURCE10} %{buildroot}/srv/www/sarg/
-%{__ln_s} -f ../../../etc/sarg.conf %{buildroot}%{_datadir}/%{name}/sarg.conf
-%{__install} -d %{buildroot}%{_sbindir}
-%{__install} -m 755 %{SOURCE2} %{buildroot}%{_sbindir}
-%{__install} -m 644 %{SOURCE3} %{buildroot}%{_datadir}/%{name}/sarg.hosts
-%{__install} -d %{buildroot}%{_localstatedir}/adm/fillup-templates
-%{__install} -m 644 %{SOURCE4} 
%{buildroot}%{_localstatedir}/adm/fillup-templates
-%{__install} -D -m 755 %{SOURCE5} 
%{buildroot}%{_sysconfdir}/cron.daily/suse.de-sarg
-%{__install} -D -m 755 %{SOURCE6} 
%{buildroot}%{_sysconfdir}/cron.weekly/suse.de-sarg
-%{__install} -D -m 755 %{SOURCE7} 
%{buildroot}%{_sysconfdir}/cron.monthly/suse.de-sarg
-%{__install} -d -m 755 %{buildroot}%{_mandir}/man8
-%{__install} -m 644 %{SOURCE8} %{buildroot}%{_mandir}/man8
+install -d  %{buildroot}/srv/www/htdocs
+%make_install
+install -d  %{buildroot}%{_sysconfdir}/apache2/conf.d
+install -d  %{buildroot}/srv/www/sarg
+install -d  %{buildroot}%{_datadir}/%{name}/languages
+install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/sarg.conf
+install -m 644 %{SOURCE9} %{buildroot}%{_sysconfdir}/apache2/conf.d/
+install -m 644 %{SOURCE10} %{buildroot}/srv/www/sarg/
+ln -s -f ../../..%{_sysconfdir}/sarg.conf 
%{buildroot}%{_datadir}/%{name}/sarg.conf
+install -d %{buildroot}%{_sbindir}
+install -m 755 %{SOURCE2} %{buildroot}%{_sbindir}
+install -m 644 %{SOURCE3} %{buildroot}%{_datadir}/%{name}/sarg.hosts
+install -d %{buildroot}%{_localstatedir}/adm/fillup-templates
+install -m 644 %{SOURCE4} %{buildroot}%{_localstatedir}/adm/fillup-templates
+install -D -m 755 %{SOURCE5} %{buildroot}%{_sysconfdir}/cron.daily/suse.de-sarg
+install -D -m 755 %{SOURCE6} 
%{buildroot}%{_sysconfdir}/cron.weekly/suse.de-sarg
+install -D -m 755 %{SOURCE7} 
%{buildroot}%{_sysconfdir}/cron.monthly/suse.de-sarg
+install -d -m 755 %{buildroot}%{_mandir}/man8
+install -m 644 %{SOURCE8} %{buildroot}%{_mandir}/man8
 
 %post
 %{fillup_only -n sarg}
@@ -114,6 +103,8 @@
 %defattr(-,root,root)
 %config(noreplace) %{_sysconfdir}/sarg.conf
 %{_sysconfdir}/cron.*/suse.de-sarg
+%dir /etc/apache2
+%dir /etc/apache2/conf.d
 %config(noreplace) %{_sysconfdir}/apache2/conf.d/sarg-apache.conf
 %{_bindir}/sarg
 %{_sbindir}/sarg-reports
@@ -132,8 +123,8 @@
 
 %defattr(0644,root,root,0755)
 /srv/www/htdocs/sarg-php
-%doc %{_mandir}/man1/%{name}*
-%doc %{_mandir}/man8/%{name}-report*
+%{_mandir}/man1/%{name}*
+%{_mandir}/man8/%{name}-report*
 %doc CONTRIBUTORS COPYING ChangeLog DONATIONS LICENSE README
 
 %changelog


++++++ sarg-no-werror.patch ++++++
Index: sarg-2.3.10/configure.in
===================================================================
--- sarg-2.3.10.orig/configure.in
+++ sarg-2.3.10/configure.in
@@ -40,24 +40,6 @@ if test "$have_extra_warnings" = "no" ;
     CFLAGS="${saved_CFLAGS}"
 fi
 
-AC_MSG_CHECKING([for implicit-function-declaration error flag in $CC])
-saved_CFLAGS="${CFLAGS}"
-CFLAGS="${CFLAGS} -Werror=implicit-function-declaration"
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],[have_implicit_function_declaration="yes"],[have_implicit_function_declaration="no"])
-AC_MSG_RESULT($have_implicit_function_declaration)
-if test "$have_implicit_function_declaration" = "no" ; then
-    CFLAGS="${saved_CFLAGS}"
-fi
-
-AC_MSG_CHECKING([for format error flag in $CC])
-saved_CFLAGS="${CFLAGS}"
-CFLAGS="${CFLAGS} -Werror=format"
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],[have_error_format="yes"],[have_error_format="no"])
-AC_MSG_RESULT($have_error_format)
-if test "$have_error_format" = "no" ; then
-    CFLAGS="${saved_CFLAGS}"
-fi
-
 case "$host" in
    *-solaris*)
    LDFLAGS="${LDFLAGS} -lsocket -lnsl"
++++++ sarg-reports ++++++
--- /var/tmp/diff_new_pack.ZjwbdH/_old  2017-06-16 10:54:52.750689799 +0200
+++ /var/tmp/diff_new_pack.ZjwbdH/_new  2017-06-16 10:54:52.750689799 +0200
@@ -88,17 +88,32 @@
 
 
#@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
 ## Italian Language
+#       SARG=/usr/bin/sarg
+#     CONFIG=/etc/sarg/sarg.conf
+#    HTMLOUT=/var/www/html/admin/log/proxy
+#  PAGETITLE="Statistiche Proxy di $(hostname)"
+#    LOGOIMG=http://www.initzero.it/images/initzero-logo.jpg
+#   LOGOLINK=http://www.initzero.it
+#      DAILY=Giornaliero
+#     WEEKLY=Settimanale
+#    MONTHLY=Mensile
+#EXCLUDELOG1="SARG: Nessun records trovato."
+#EXCLUDELOG2="SARG: Fine"
+#@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+
+#@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+## English Language
        SARG=/usr/bin/sarg
-     CONFIG=/etc/sarg/sarg.conf
-    HTMLOUT=/var/www/html/admin/log/proxy
-  PAGETITLE="Statistiche Proxy di $(hostname)"
-    LOGOIMG=http://www.initzero.it/images/initzero-logo.jpg
-   LOGOLINK=http://www.initzero.it
-      DAILY=Giornaliero
-     WEEKLY=Settimanale
-    MONTHLY=Mensile
-EXCLUDELOG1="SARG: Nessun records trovato."
-EXCLUDELOG2="SARG: Fine"
+     CONFIG=/etc/sarg.conf
+    HTMLOUT=/srv/www/sarg
+  PAGETITLE="Proxy report of $(hostname)"
+    LOGOIMG=/sarg/platform_suse.gif
+   LOGOLINK=
+      DAILY=Daily
+     WEEKLY=Weekly
+    MONTHLY=Monthly
+#EXCLUDELOG1="SARG: Nessun records trovato."
+#EXCLUDELOG2="SARG: Fine"
 
#@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
 
 



Reply via email to