- pl cosmetic, gpm-friendly Source URL, use _kdedocdir macro

Changed files:
    apollon.spec -> 1.15

diff --git a/apollon.spec b/apollon.spec
index 08664e11850dc424175f745d2fc39dcec3fbf44a..2e51644d95a54b4e56753079f4f47f45f3d3380a 100644 (file)
--- a/apollon.spec
+++ b/apollon.spec
@@ -1,22 +1,21 @@
 Summary:       KDE-based client for the p2p-protocol giFT (OpenFT, FastTrack(Kazaa), Gnutella)
 Summary:       KDE-based client for the p2p-protocol giFT (OpenFT, FastTrack(Kazaa), Gnutella)

-Summary(pl):   Klient bazuj±cy na KDE dla protoko³u p2p giFT (OpenFT, FastTrack(Kazaa), Gnutella)
+Summary(pl):   Oparty na KDE klient dla protoko³u p2p giFT (OpenFT, FastTrack(Kazaa), Gnutella)

 Name:          apollon
 Version:       1.0
 Release:       1
 License:       GPL
 Group:         X11/Applications/Networking
 Name:          apollon
 Version:       1.0
 Release:       1
 License:       GPL
 Group:         X11/Applications/Networking

-Source0:       http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Source0:       http://dl.sourceforge.net/apollon/%{name}-%{version}.tar.bz2

 # Source0-md5: a7e656f61c4fc4815aa7150c6b02d1ca
 Patch0:                %{name}-dtd-location.patch
 URL:           http://apollon.sourceforge.net/
 BuildRequires: giFT-devel
 BuildRequires: kdelibs-devel
 BuildRequires: libmagic-devel
 # Source0-md5: a7e656f61c4fc4815aa7150c6b02d1ca
 Patch0:                %{name}-dtd-location.patch
 URL:           http://apollon.sourceforge.net/
 BuildRequires: giFT-devel
 BuildRequires: kdelibs-devel
 BuildRequires: libmagic-devel

+BuildRequires: rpmbuild(macros) >= 1.129

 Requires:      giFT-openft
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 Requires:      giFT-openft
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 

-%define                _htmldir        %{_docdir}/kde/HTML
-

 %description
 Apollon is a KDE-based client for the p2p-protocol giFT (OpenFT,
 FastTrack(Kazaa!), Gnutella). It is very userfriendly, intuitively,
 %description
 Apollon is a KDE-based client for the p2p-protocol giFT (OpenFT,
 FastTrack(Kazaa!), Gnutella). It is very userfriendly, intuitively,


@@ -34,7 +33,7 @@ plik
 
 %build
 kde_appsdir="%{_desktopdir}"; export kde_appsdir
 
 %build
 kde_appsdir="%{_desktopdir}"; export kde_appsdir

-kde_htmldir="%{_htmldir}"; export kde_htmldir
+kde_htmldir="%{_kdedocdir}"; export kde_htmldir

 %configure
 %{__make}
 
 %configure
 %{__make}
 


@@ -44,7 +43,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 

-mv -f $RPM_BUILD_ROOT%{_desktopdir}/{Applications/*.desktop,}
+mv -f $RPM_BUILD_ROOT%{_desktopdir}{/Applications/*.desktop,}

 
 # Ugly hack, but works.
 # Without this in apollon are no icons.
 
 # Ugly hack, but works.
 # Without this in apollon are no icons.