+# TODO:
+# - update to >= 4.0.2
+# - switch to current db
+# - kill gd-static BR
+# - stop using hardcoded /srv subdir by default
Summary: DESIRE - statistics access library
-Summary(pl): DESIRE - biblioteka, statysytyka dostepu
+Summary(pl.UTF-8): DESIRE - biblioteka, statystyka dostępu
Name: desire
Version: 3.1
-Release: 0.4
-License: ???
+Release: 2
+License: BSD-like
Group: Libraries
-Group(de): Libraries
-Group(fr): Librairies
-Group(pl): Biblioteki
-Source0: http://www.spelio.net.ru/soft/desire-3.1.tar.gz
+Source0: http://lionet.info/soft/%{name}-%{version}.tar.gz
+# Source0-md5: 86fde160bb54f868a6a9ba2bc2925ec2
Patch0: %{name}-QnD.patch
Patch1: %{name}-DESTDIR.patch
+URL: http://lionet.info/
BuildRequires: autoconf
-BuildRequires: gd-devel
-BuildRequires: gd-static
-BuildRequires: libstrfunc-devel
+BuildRequires: automake
BuildRequires: db3-devel
-
+BuildRequires: fhs-compliance
+BuildRequires: gd-devel >= 2.0.1
+BuildRequires: gd-static >= 2.0.1
+BuildRequires: libstrfunc-devel
+BuildRequires: libtool
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define _cgidir /home/httpd/cgi-bin
+%define _cgidir /srv/httpd/cgi-bin
%define _logdir /var/log/desire
%description
-Package includes:
- 1. The library, libdesire, with header files
- 2. Display library, libddraw, customizable at run time
- 3. The set of dependent programs:
- + Proxy (Squid, OOPS) accounting convertor and graphics
- generator
- + Cisco ip accounting converter and graphics generator
- + Helper utilities
+Package includes main library (libdesire) and display library,
+libddraw, customizable at run time.
+
+%description -l pl.UTF-8
+Pakiet zawiera główną bibliotekę (libdesire) i bibliotekę do
+rysowania, libddraw, konfigurowalną w locie.
%package devel
Summary: Development part of the desire library
-Summary(pl): Czê¶æ biblioteki desire przeznaczona dla developerów
+Summary(pl.UTF-8): Część biblioteki desire przeznaczona dla developerów
Group: Development/Libraries
-Group(de): Entwicklung/Libraries
-Group(fr): Development/Librairies
-Group(pl): Programowanie/Biblioteki
-Requires: %{name} = %{version}
+Requires: %{name} = %{version}-%{release}
%description devel
This package contains the files needed for development of programs
linked against desire.
+%description devel -l pl.UTF-8
+Ten pakiet zawiera pliki potrzebne do kompilowania programów z
+biblioteką desire.
+
%package static
Summary: Static desire library
-Summary(pl): Statyczna biblioteka desire
+Summary(pl.UTF-8): Statyczna biblioteka desire
Group: Development/Libraries
-Group(de): Entwicklung/Libraries
-Group(fr): Development/Librairies
-Group(pl): Programowanie/Biblioteki
-Requires: %{name} = %{version}
+Requires: %{name}-devel = %{version}-%{release}
%description static
This package contains static desire library.
+%description static -l pl.UTF-8
+Ten pakiet zawiera statyczną bibliotekę desire.
+
%package progs
Summary: Utility programs that use desire
-Summary(pl): Narzêdzia które u¿ywaj± desire
+Summary(pl.UTF-8): Narzędzia które używają desire
Group: Applications
-Group(de): Applikationen
-Group(pl): Aplikacje
-Requires: %{name} = %{version}
-Requires: apache
+Requires: %{name} = %{version}-%{release}
+Requires: webserver = apache
%description progs
-These are utility programs supplied with desire.
+These are utility programs supplied with desire:
+ - Proxy (Squid, OOPS) accounting convertor and graphics generator
+ - Cisco ip accounting converter and graphics generator
+ - Helper utilities
+
+%description progs -l pl.UTF-8
+Tutaj są programy dostarczone z desire:
+ - Konwerter i generator graficznych statystyk z Proxy (Squid, OOPS)
+ - Konwerter i generator grafik z Cisco
+ - programy pomocnicze
%prep
-%setup -q
-%patch0 -p1
+%setup -q
+%patch0 -p1
%patch1 -p1
%build
-autoconf
+rm -f ltmain.sh aclocal.m4
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
%configure
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_cgidir}/{cistat,proxy_stats} \
+ $RPM_BUILD_ROOT%{_logdir}/{calls,traffic,dialup/Usres,proxy/Domains}
%{__make} install \
- DESTDIR=$RPM_BUILD_ROOT
-
-install -d $RPM_BUILD_ROOT%{_cgidir}/{cistat,proxy_stats}
-install -d $RPM_BUILD_ROOT%{_logdir}/{calls,traffic,dialup/Usres,proxy/Domains}
+ DESTDIR=$RPM_BUILD_ROOT
install depend/cistat/html/* $RPM_BUILD_ROOT%{_cgidir}/cistat
install depend/proxy_stats/html/* $RPM_BUILD_ROOT%{_cgidir}/proxy_stats
-install conf/* $RPM_BUILD_ROOT/%{_sysconfdir}
-touch $RPM_BUILD_ROOT/%{_sysconfdir}/DOMAINS
+install conf/* $RPM_BUILD_ROOT%{_sysconfdir}
+touch $RPM_BUILD_ROOT%{_sysconfdir}/DOMAINS
%clean
rm -rf $RPM_BUILD_ROOT
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
%files
%defattr(644,root,root,755)
+%doc AUTHORS ChangeLog
%attr(755,root,root) %{_libdir}/*.so.*
%files devel