- 2.8beta1

Changed files:
    yakuake.spec -> 1.17

diff --git a/yakuake.spec b/yakuake.spec
index 47600d4a8df021bcff7358d563b522df24bc994b..18d7289b6c33120e07ff78a58e8d93d548239cbb 100644 (file)
--- a/yakuake.spec
+++ b/yakuake.spec
@@ -1,17 +1,15 @@
+%define        snap    beta1
 Summary:       Very powerful Quake style Konsole
 Summary(de.UTF-8):     Ein Quake ähnlicher Konsole Emulator
 Summary(pl.UTF-8):     Rozbudowany emulator terminala w stylu Quake
 Name:          yakuake
-Version:       2.7.5
-Release:       2
+Version:       2.8
+Release:       0.%{snap}.1
 License:       GPL v2
 Group:         X11/Applications
-Source0:       http://www.kde-apps.org/content/files/29153-%{name}-%{version}.tar.bz2
-# Source0-md5: 6905f9a6d448c7bfc818cd2d7c88cab4
+Source0:       http://download.berlios.de/yakuake/%{name}-%{version}-beta1.tar.bz2
+# Source0-md5: 1de02747da716b304f9244032fda7eb4
 Patch0:                %{name}-desktop.patch
-Patch1:                kde-ac260.patch
-Patch2:                kde-ac260-lt.patch
-Patch3:                kde-am.patch
 URL:           http://extragear.kde.org/apps/yakuake/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -29,34 +27,27 @@ Eine KDE Konsole die der aus Quake ähnelt.
 Konsola KDE wyglądem przypominająca tę z Quake.
 
 %prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+%setup -q -n %{name}-%{version}-%{snap}
 
 %build
 cp -f /usr/share/automake/config.sub admin
 %{__make} -f admin/Makefile.common cvs
 %configure \
 %if "%{_lib}" == "lib64"
-        --enable-libsuffix=64 \
+               --enable-libsuffix=64 \
 %endif
-        --%{?debug:en}%{!?debug:dis}able-debug%{?debug:=full} \
-        --with-qt-libraries=%{_libdir}
+               --%{?debug:en}%{!?debug:dis}able-debug%{?debug:=full} \
+               --with-qt-libraries=%{_libdir}
 
 %{__make}
 
 %install
-rm -rf $RPM_BUILD_ROOT%{_desktopdir}
-
-install -d $RPM_BUILD_ROOT%{_desktopdir}
 
+rm -rf $RPM_BUILD_ROOT
 %{__make} install \
+       xdg_appsdir=%{_desktopdir} \
        DESTDIR=$RPM_BUILD_ROOT
 
-mv $RPM_BUILD_ROOT{%{_datadir}/applnk/Utilities,%{_desktopdir}}/yakuake.desktop
-
 %find_lang %{name}
 
 %clean
@@ -64,17 +55,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS 
+%doc AUTHORS
 %attr(755,root,root) %{_bindir}/yakuake
 %{_desktopdir}/*.desktop
 %dir %{_datadir}/apps/yakuake
-%dir %{_datadir}/apps/yakuake/default
-%{_datadir}/apps/yakuake/default/tabs.skin
-%dir %{_datadir}/apps/yakuake/default/tabs
-%{_datadir}/apps/yakuake/default/tabs/*.png
-%{_datadir}/apps/yakuake/default/title.skin
-%dir %{_datadir}/apps/yakuake/default/title
-%{_datadir}/apps/yakuake/default/title/*.png
-%{_datadir}/apps/yakuake/default/install.sh
-%{_datadir}/apps/yakuake/default/manual.readme
+%dir %{_datadir}/apps/yakuake/*
+%{_datadir}/apps/yakuake/*/tabs.skin
+%{_datadir}/apps/yakuake/*/icon.png
+%dir %{_datadir}/apps/yakuake/*/tabs
+%{_datadir}/apps/yakuake/*/tabs/*.png
+%{_datadir}/apps/yakuake/*/title.skin
+%dir %{_datadir}/apps/yakuake/*/title
+%{_datadir}/apps/yakuake/*/title/*.png
+%{_datadir}/config.kcfg/*.kcfg
 %{_iconsdir}/hicolor/*x*/apps/yakuake.png