Hello community, here is the log from the commit of package ntop checked in at Fri Feb 29 23:28:31 CET 2008. -------- --- ntop/ntop.changes 2007-08-07 09:40:39.000000000 +0200 +++ ntop/ntop.changes 2008-02-29 15:08:03.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Feb 29 15:00:53 CET 2008 - lmichnovic@suse.cz + +- fixed obsoleted run_ldconfig macro +- spec file adjustment for seamless build for older distributions + in BuildService + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ntop.spec ++++++ --- /var/tmp/diff_new_pack.x16637/_old 2008-02-29 23:26:11.000000000 +0100 +++ /var/tmp/diff_new_pack.x16637/_new 2008-02-29 23:26:11.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package ntop (Version 3.3) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -10,14 +10,33 @@ # norootforbuild + Name: ntop -BuildRequires: dos2unix fdupes freetype2-devel gcc-c++ gd-devel gdbm-devel libart_lgpl-devel libjpeg-devel libpcap-devel libpng-devel lsof mysql-devel net-snmp-devel openssl-devel readline-devel rrdtool-devel xorg-x11-devel +BuildRequires: dos2unix freetype2-devel gcc-c++ gd-devel gdbm-devel libart_lgpl-devel libjpeg-devel libpng-devel lsof mysql-devel net-snmp-devel openssl-devel readline-devel +%if 0%{?suse_version} +BuildRequires: tcpd-devel xorg-x11-devel +PreReq: /bin/cat %fillup_prereq %insserv_prereq sysconfig +%if 0%{?suse_version} > 1020 +BuildRequires: fdupes libpcap-devel rrdtool-devel +%else +BuildRequires: libpcap rrdtool +%endif +%else +%if 0%{?fedora_version} +PreReq: /bin/cat /sbin/insserv /bin/fillup sysconfig +BuildRequires: libpcap-devel rrdtool-devel xorg-x11-devel +%else +%if 0%{?mandriva_version} +BuildRequires: libpcap-devel librrdtool-devel rrdtool +PreReq: /bin/cat /sbin/insserv /bin/fillup sysconfig +%endif +%endif +%endif License: GPL v2 or later Group: Productivity/Networking/Diagnostic -PreReq: %fillup_prereq %insserv_prereq /bin/cat sysconfig -Autoreqprov: on +AutoReqProv: on Version: 3.3 -Release: 3 +Release: 66 Summary: Web-Based Network Traffic Monitor Source: %{name}-%{version}.tar.bz2 Source2: rcntop @@ -28,7 +47,7 @@ Patch2: rrdPlugin.diff Patch4: dotpath.diff Patch5: libtool.diff -URL: http://www.ntop.org +Url: http://www.ntop.org BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -55,6 +74,7 @@ ./autogen.sh # NTOP_AUTOREBUILD=yes ./configure || echo "new autoconf prepared" # now we are ready for the real configure... +%if "%(xft-config --prefix)" == "/usr" CFLAGS="$RPM_OPT_FLAGS -DHAVE_NCURSES_H" \ ./configure \ --sysconfdir=/etc \ @@ -67,6 +87,20 @@ --disable-static \ --enable-sslv3 \ --enable-i18n +%else +CFLAGS="$RPM_OPT_FLAGS -DHAVE_NCURSES_H -L/usr/X11R6/%_lib -I/usr/X11R6/include" \ +./configure \ + --sysconfdir=/etc \ + --prefix=/usr \ + --mandir=%{_mandir} \ + --localstatedir=/var/lib \ + --libdir=%{_libdir} \ + --datadir=%{_datadir} \ + --x-libraries=/usr/X11R6/%_lib \ + --disable-static \ + --enable-sslv3 \ + --enable-i18n +%endif make %{?jobs:-j%jobs} gcc -o passcheck $RPM_OPT_FLAGS %{SOURCE4} -lgdbm @@ -94,8 +128,9 @@ cp ntop-cert.pem docs/ cp %SOURCE5 . find $RPM_BUILD_ROOT/usr/share/ntop/html -type f -print0 | xargs -0 chmod 644 - +%if 0%{?suse_version} > 1020 %fdupes $RPM_BUILD_ROOT/usr/share/ntop/html/ +%endif find $RPM_BUILD_ROOT -name "*.la" | xargs rm rm docs/ntop-autotools.vsd dos2unix docs/RedHat-rpmbuild-HOWTO.txt @@ -109,12 +144,14 @@ fi fi chown wwwrun:www /usr/share/ntop /var/lib/ntop +%if 0%{?suse_version} > 1010 etc/sysconfig/network/scripts/hwdesc2iface etc/sysconfig/ntop NTOPD_IFACE -%run_ldconfig +%endif +/sbin/ldconfig %{fillup_and_insserv -n ntop ntop } %postun -%run_ldconfig +/sbin/ldconfig %{insserv_cleanup} %clean @@ -133,7 +170,7 @@ /usr/share/ntop/html %dir %{_libdir}/ntop %{_libdir}/ntop/plugins -%{_mandir}/man8/ntop.8.gz +%{_mandir}/man8/ntop.8.* /var/adm/fillup-templates/sysconfig.ntop %dir %attr(-,wwwrun,www) /var/lib/ntop %dir /etc/ntop @@ -144,183 +181,186 @@ /etc/ntop/p2c.opt.table.gz /etc/ntop/specialMAC.txt.gz - %changelog -* Tue Aug 07 2007 - bg@suse.de +* Fri Feb 29 2008 lmichnovic@suse.cz +- fixed obsoleted run_ldconfig macro +- spec file adjustment for seamless build for older distributions + in BuildService +* Tue Aug 07 2007 bg@suse.de - remove first (wrong) definition of free -* Wed Aug 01 2007 - bg@suse.de +* Wed Aug 01 2007 bg@suse.de - update to version 3.3 (mainly bugfixes and automake changes) - fix some rpmlint warnings -* Thu Jul 26 2007 - prusnak@suse.cz +* Thu Jul 26 2007 prusnak@suse.cz - changed libpcap to libpcap-devel in BuildRequires -* Thu Jun 21 2007 - dmueller@suse.de +* Fri Jun 22 2007 dmueller@suse.de - update BuildRequires -* Tue May 08 2007 - schwab@suse.de +* Tue May 08 2007 schwab@suse.de - Fix default location of dot. -* Mon Mar 26 2007 - rguenther@suse.de +* Mon Mar 26 2007 rguenther@suse.de - add gdbm-devel BuildRequires. -* Tue Nov 07 2006 - ro@suse.de +* Tue Nov 07 2006 ro@suse.de - fix docu permissions -* Mon Sep 11 2006 - schwab@suse.de +* Mon Sep 11 2006 schwab@suse.de - Workaround lack of datarootdir support. -* Tue Apr 04 2006 - bg@suse.de +* Tue Apr 04 2006 bg@suse.de - removing files ntop_darwin.[ch] (Bug #161809) - fixing user/group (Bug #140309) -* Mon Mar 20 2006 - bg@suse.de +* Mon Mar 20 2006 bg@suse.de - fix initialization of formatBuf (Bug #159477) -* Thu Jan 26 2006 - bg@suse.de +* Thu Jan 26 2006 bg@suse.de - fix bug #145502 (coding problems uncovered by new compiler) -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Sun Jan 15 2006 - schwab@suse.de +* Sun Jan 15 2006 schwab@suse.de - Don't strip binaries. -* Mon Dec 12 2005 - bg@suse.de +* Mon Dec 12 2005 bg@suse.de - upgrade to version 3.2 - fix several compiler complaints -* Thu Oct 06 2005 - ro@suse.de +* Thu Oct 06 2005 ro@suse.de - matched number of arguments to printf formats -* Fri Sep 09 2005 - bg@suse.de +* Fri Sep 09 2005 bg@suse.de - removing execute permissions on gz files (Bug #114849) -* Mon Aug 29 2005 - bg@suse.de +* Mon Aug 29 2005 bg@suse.de - update to 3.1.50, recent version did not come up anymore. (Bug #113816) -* Mon Apr 25 2005 - mmj@suse.de +* Mon Apr 25 2005 mmj@suse.de - Correct memset call -* Fri Apr 01 2005 - mmj@suse.de +* Fri Apr 01 2005 mmj@suse.de - Don't return random data -* Mon Mar 21 2005 - schwab@suse.de +* Mon Mar 21 2005 schwab@suse.de - Convert configuration name to interface name in start script. -* Fri Mar 04 2005 - bg@suse.de +* Fri Mar 04 2005 bg@suse.de - passcheck has to be called as root with the new version -* Tue Feb 08 2005 - bg@suse.de +* Tue Feb 08 2005 bg@suse.de - update to version 3.1 - adopt fixes from older version - fix make install - make passcheck not segfault on failure of open password database -* Thu Oct 07 2004 - bg@suse.de +* Thu Oct 07 2004 bg@suse.de - fix and remove -fno-strict-aliasing -* Fri Sep 24 2004 - bg@suse.de +* Fri Sep 24 2004 bg@suse.de - fix traffic data collection (Bug #43815) -* Mon Sep 06 2004 - bg@suse.de +* Mon Sep 06 2004 bg@suse.de - update to version 3.0.53 - rename ntop to rcntop to avoid conflict with directory name - fix bug #41690 -* Wed Sep 01 2004 - mmj@suse.de +* Wed Sep 01 2004 mmj@suse.de - Move the mail to root into a README.SuSE where it belongs [#44349] -* Tue Jun 01 2004 - ro@suse.de +* Wed Jun 02 2004 ro@suse.de - fix build for ppc64 -* Wed Mar 31 2004 - bg@suse.de +* Wed Mar 31 2004 bg@suse.de - update to version 3.0 - remove --ignore-sigpipe (not available anymore) -* Tue Mar 30 2004 - mmj@suse.de +* Tue Mar 30 2004 mmj@suse.de - Add --ignore-sigpipe to default arguments [#37576] - Clean up initscript and add missing sections (thanks lmuelle) - Compile with -fno-strict-aliasing -* Tue Jan 20 2004 - bg@suse.de +* Tue Jan 20 2004 bg@suse.de - fixed comment in rc.config.ntop (Bug 33701) - fixed build -* Sat Jan 10 2004 - adrian@suse.de +* Sat Jan 10 2004 adrian@suse.de - build as user -* Wed Aug 20 2003 - bg@suse.de +* Wed Aug 20 2003 bg@suse.de - add activation metatdata (Bug #28909) -* Wed Jul 30 2003 - meissner@suse.de +* Wed Jul 30 2003 meissner@suse.de - remove libtool.m4 from acinclude.m4, autoreconf. - fixed dependencies of rrdPlugin, so that it loads and you can see nice pie charts etc. - reenabled thomas security patch, which was disabled upstream. -* Mon Jul 28 2003 - meissner@suse.de +* Mon Jul 28 2003 meissner@suse.de - Upgraded to 2.2c, removed intop again. Added rrdtool to nfb. -* Thu Jun 19 2003 - meissner@suse.de +* Thu Jun 19 2003 meissner@suse.de - Upgraded to 2.2, build and add intop, added missing files. -* Mon Feb 24 2003 - meissner@suse.de +* Mon Feb 24 2003 meissner@suse.de - Fixed ppc64 build by sed hack (autoreconf does not work) - buildrooted. -* Mon Feb 10 2003 - bg@suse.de +* Mon Feb 10 2003 bg@suse.de - update to version 2.1.56 -* Wed Sep 18 2002 - bg@suse.de +* Wed Sep 18 2002 bg@suse.de - added check program for admin user - rename of config file when updateing (Bug #19814) - removed (very old) README.Suse (Bug #16852) -* Tue Aug 06 2002 - ro@suse.de +* Tue Aug 06 2002 ro@suse.de - added missing prereqs -* Tue Aug 06 2002 - bg@suse.de +* Tue Aug 06 2002 bg@suse.de - upgrade to version 2.1.2 - fixed init script for new version - change default port binding -* Sat Jul 27 2002 - adrian@suse.de +* Sat Jul 27 2002 adrian@suse.de - fix neededforbuild -* Fri Jul 12 2002 - bg@suse.de +* Fri Jul 12 2002 bg@suse.de - upgrade to version 2.1.0 - split up diff - fixed configure.in of new version - enabled mysql - renamed ntopd to ntop according to useful LSB names -* Wed Apr 17 2002 - bg@suse.de +* Wed Apr 17 2002 bg@suse.de - fix build for s390x -* Fri Mar 15 2002 - ro@suse.de +* Fri Mar 15 2002 ro@suse.de - update to 2.0.1 for security fix - fixed configure.in in gdchart to use system libraries - run as user wwwrun (parameter -u wwwrun in startscript) - fix segfault in nfsPlugin.c -* Fri Mar 01 2002 - pthomas@suse.de +* Fri Mar 01 2002 pthomas@suse.de - Correct notification mail. -* Fri Feb 01 2002 - ro@suse.de +* Fri Feb 01 2002 ro@suse.de - changed neededforbuild <libpng> to <libpng-devel-packages> -* Mon Jan 21 2002 - ro@suse.de +* Mon Jan 21 2002 ro@suse.de - moved variables to sysconfig/ntopd -* Thu Jan 10 2002 - egmont@suselinux.hu +* Thu Jan 10 2002 egmont@suselinux.hu - changed /sbin/init.d to /etc/init.d in init script comment -* Tue Jan 08 2002 - bg@suse.de +* Tue Jan 08 2002 bg@suse.de - update to version 2.0 - using system libraries instead of delivered (libz, libpng, libgd) -* Wed Nov 14 2001 - ro@suse.de +* Wed Nov 14 2001 ro@suse.de - hack for automake 1.5 -* Wed Jul 18 2001 - uli@suse.de +* Wed Jul 18 2001 uli@suse.de - fixed OS ident via nmap -* Thu Jul 05 2001 - bg@suse.de +* Thu Jul 05 2001 bg@suse.de - fix Bug #9056 - add ucdsnmp and ssl - activate gdchart -* Mon Jun 11 2001 - bg@suse.de +* Mon Jun 11 2001 bg@suse.de - moved AC_INIT to the beginning of configure.in -* Wed May 09 2001 - mfabian@suse.de +* Thu May 10 2001 mfabian@suse.de - bzip2 sources -* Fri Feb 23 2001 - ro@suse.de +* Fri Feb 23 2001 ro@suse.de - added readline/readline-devel to neededforbuild (split from bash) -* Fri Dec 01 2000 - ro@suse.de +* Fri Dec 01 2000 ro@suse.de - moved startscript to etc -* Fri Nov 24 2000 - bg@suse.de +* Fri Nov 24 2000 bg@suse.de - cleaned up specfile with ro -* Thu Nov 23 2000 - bg@suse.de +* Thu Nov 23 2000 bg@suse.de - removed runlevel links in ntop.spec - fixed init script for 7.1 -* Fri Nov 10 2000 - bg@suse.de +* Fri Nov 10 2000 bg@suse.de - new verion 1.3.2 this fixes Bug #4121 -* Fri Oct 13 2000 - kukuk@suse.de +* Fri Oct 13 2000 kukuk@suse.de - fix compiling with glibc 2.2 -* Mon Aug 28 2000 - ro@suse.de +* Mon Aug 28 2000 ro@suse.de - cvs-update of 2000/08/28 (all patches included) -* Tue Aug 15 2000 - ro@suse.de +* Tue Aug 15 2000 ro@suse.de - update to cvs version of 2000/08/15 -* Tue Aug 15 2000 - ro@suse.de +* Tue Aug 15 2000 ro@suse.de - removed deprecated referring to .ntop -* Wed Jul 05 2000 - ro@suse.de +* Wed Jul 05 2000 ro@suse.de - fixed another segfault -* Fri Jun 30 2000 - ro@suse.de +* Fri Jun 30 2000 ro@suse.de - added fix for segfault from cvs -* Tue Jun 27 2000 - ro@suse.de +* Tue Jun 27 2000 ro@suse.de - update to 1.3.1 -* Sat Mar 04 2000 - uli@suse.de +* Sat Mar 04 2000 uli@suse.de - moved man page to %%{_mandir} -* Thu Jan 13 2000 - freitag@suse.de +* Thu Jan 13 2000 freitag@suse.de - dropped own libpcap and use one in needforbuild - update to version 1.1 - using configure instead of own Makefile - new tags in specfile like version -* Mon Sep 13 1999 - bs@suse.de +* Mon Sep 13 1999 bs@suse.de - ran old prepare_spec on spec file to switch to new prepare_spec. -* Sat Jun 12 1999 - ray@suse.de +* Sat Jun 12 1999 ray@suse.de - fix in init-script -* Tue Dec 01 1998 - ray@suse.de +* Tue Dec 01 1998 ray@suse.de - new package ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de