/[smecontribs]/rpms/bandwidthd/contribs10/bandwidthd.spec

Diff of /rpms/bandwidthd/contribs10/bandwidthd.spec

Parent Directory | Revision Log | View Revision Graph Revision Graph | View Patch Patch

-Revision 1.1 by brianr,
Wed Oct 21 11:20:49 2020 UTC
+Revision 1.7 by jpp,
Sun Jun  6 05:11:19 2021 UTC
 Line 3
  Name:           bandwidthd
  Version:        2.0.1.1
- Release:        4%{?dist}
+ Release: 8%{?dist}
  Summary:        Tracks network usage and builds html and graphs
  Group:          System Environment/Daemons
  License:        GPL+
  URL:            http://bandwidthd.sourceforge.net/
  Source0:        bandwidthd-2.0.1.1.tgz
  Source1:        %{name}
+ Source2:        %{name}.service
  Patch0:         bandwidthd-destdir.patch
  Patch1:         bandwidthd-pgsql.patch
  Patch2:         bandwidthd-mysql.patch
+ Patch3:         bandwidthd-2.0.1.1-mariadb.patch
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  BuildRequires:  autoconf, gd-devel, libpng-devel
  %{?!_without_pgsql:BuildRequires: postgresql-devel}
-Line 24 
 BuildRequires:  libpcap-devel
+Line 28 
 BuildRequires:  libpcap-devel
  %endif
  BuildRequires: bison, flex
  BuildRequires:  mysql-devel
- Requires(post): /sbin/chkconfig
- Requires(preun):/sbin/chkconfig
+ Requires(post): systemd-units
- Requires(preun):/sbin/service
+ Requires(preun): systemd-units
+ Requires(postun): systemd-units
+ BuildRequires: systemd-units
  %description
  Bandwidthd is a UNIX daemon/Windows service for graphing the traffic
-Line 53 
 is graphed on a Celeron 450 every 10 min
+Line 60 
 is graphed on a Celeron 450 every 10 min
  #-b .pgsql
  %patch2 -p1
  #-b .mysql
+ %patch3 -p1
  %build
  cp -af /usr/lib/rpm/config.{sub,guess} .
-Line 64 
 autoconf
+Line 72 
 autoconf
    --bindir=%{_bindir} \
    --localstatedir=%{_var}/www\
    --datadir=%{_var}/www
- make %{?_smp_mflags}
+ make -j2
+ # # in place of make %{?_smp_mflags} as it will do -j4 on builder and one task will end before the one it needs
  %install
-Line 73 
 make install DESTDIR=$RPM_BUILD_ROOT
+Line 82 
 make install DESTDIR=$RPM_BUILD_ROOT
  # init script
  install -d $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
  install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/
+ mkdir -p $RPM_BUILD_ROOT%{_unitdir}
+ install %{SOURCE2} $RPM_BUILD_ROOT%{_unitdir}/
  # install apache configuration
  install -d $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
  echo "Alias /%{name} %{_var}/www/%{name}/htdocs" \
-Line 89 
 rm -rf $RPM_BUILD_ROOT
+Line 103 
 rm -rf $RPM_BUILD_ROOT
  %post
- /sbin/chkconfig --add bandwidthd
+ #%systemd_post %{name}.service
  %preun
- if [ $1 = 0 ]; then
+ %systemd_preun %{name}.service
-  /sbin/service bandwidthd stop > /dev/null 2>&1
-  /sbin/chkconfig --del bandwidthd
+ %postun
- fi
+ %systemd_postun_with_restart %{name}.service
  %files
-Line 107 
 fi
+Line 121 
 fi
  %config(noreplace) %{_sysconfdir}/%{name}.conf
  %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
  %attr(755,root,root) %{_sysconfdir}/rc.d/init.d/%{name}
+ %{_unitdir}/%{name}.service
  %{_sbindir}/%{name}
  %dir %{_var}/www/%{name}
  %{_var}/www/%{name}/*
  %attr(755,root,root) %{_var}/www/%{name}/phphtdocs/*.sh
  %changelog
+ * Sun Jun 06 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.0.1.1-8.sme
+ - use ENGINE in place of TYPE for mariadb
+ * Thu Jun 03 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.0.1.1-7.sme
+ - build test ; make -j2
+ * Wed Feb 03 2021 BogusDateBot
+ - Eliminated rpmbuild "bogus date" warnings due to inconsistent weekday,
+   by assuming the date is correct and changing the weekday.
+   Sun Dec 13 2008 --> Sun Dec 07 2008 or Sat Dec 13 2008 or Sun Dec 14 2008 or ....
+ * Thu Oct 22 2020 Brian Read <brianr@bjsystems.co.uk> 2.0.1.1-5.sme
+ - Initial import into SME10 tree [SME: 11046 ]
+ - Sort out spec file for systemd and add bandwidthd.service file
  * Sat Sep 19 2015 stephane de Labrusse <stephdl@de-labrusse.fr> - 2.0.1.1-4
  - Initial Import to sme9contribs
  - corrected the failed patch bandwidthd-mysql.patch
-Line 126 
 fi
+Line 159 
 fi
  - added back autoconf and autoheader
  - cond buid for rhel4
- * Sun Dec 13 2008 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 2.0.1-11
+ * Sat Dec 13 2008 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 2.0.1-11
+   Sun Dec 13 2008 --> Sun Dec 07 2008 or Sat Dec 13 2008 or Sun Dec 14 2008 or ....
  - updated config.sub and config.guess to build on ppc64
  - added libpng-devel again (required for EPEL-4)

 Legend:



Removed lines/characters
 


Changed lines/characters


 
Added lines/characters
 Legend:



Removed lines/characters
 


Changed lines/characters


 
Added lines/characters
-Removed lines/characters
+Added lines/characters

admin@koozali.org	ViewVC Help
Powered by ViewVC 1.2.1