X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=desire.spec;h=85001dff9ad64f70053d6dfe0d770beac0055d5c;hb=61ba1fd12c846af0e5d4b3c0c29c5e4821cf3361;hp=e1fddfab4af749d40abd6ba2de594f8638d2319c;hpb=e9d5e36ca1704809b15af35f8f52de64abe0cb47;p=packages%2Fdesire.git

diff --git a/desire.spec b/desire.spec
index e1fddfa..85001df 100644
--- a/desire.spec
+++ b/desire.spec
@@ -1,66 +1,68 @@
 Summary:	DESIRE - statistics access library
-Summary(pl):	DESIRE - biblioteka, statystyka dostêpu
+Summary(pl.UTF-8):   DESIRE - biblioteka, statystyka dostępu
 Name:		desire
 Version:	3.1
-Release:	0.6
+Release:	2
 License:	BSD-like
 Group:		Libraries
 Source0:	http://www.spelio.net.ru/soft/%{name}-%{version}.tar.gz
+# Source0-md5:	86fde160bb54f868a6a9ba2bc2925ec2
 Patch0:		%{name}-QnD.patch
 Patch1:		%{name}-DESTDIR.patch
 URL:		http://www.spelio.net.ru/soft/#DESIRE
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	libtool
+BuildRequires:	db3-devel
+BuildRequires:	fhs-compliance
 BuildRequires:	gd-devel >= 2.0.1
 BuildRequires:	gd-static >= 2.0.1
 BuildRequires:	libstrfunc-devel
-BuildRequires:	db3-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 main library (libdesire) and display library,
 libddraw, customizable at run time.
 
-%description -l pl
-Pakiet zawiera g³ówn± bibliotekê (libdesire) i bibliotekê do
-rysowania, libddraw, konfigurowaln± w locie.
+%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
-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
-Ten pakiet zawiera pliki potrzebne do kompilowania programów z
-bibliotek± 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
-Requires:	%{name}-devel = %{version}
+Requires:	%{name}-devel = %{version}-%{release}
 
 %description static
 This package contains static desire library.
 
-%description static -l pl
-Ten pakiet zawiera statyczn± bibliotekê desire.
+%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
-Requires:	%{name} = %{version}
-Requires:	apache
+Requires:	%{name} = %{version}-%{release}
+Requires:	webserver = apache
 
 %description progs
 These are utility programs supplied with desire:
@@ -68,8 +70,8 @@ These are utility programs supplied with desire:
  - Cisco ip accounting converter and graphics generator
  - Helper utilities
 
-%description progs -l pl
-Tutaj s± programy dostarczone z desire:
+%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
@@ -81,34 +83,34 @@ Tutaj s
 
 %build
 rm -f ltmain.sh aclocal.m4
-libtoolize --copy --force
-aclocal
-autoconf
+%{__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