Author: august84 Date: Sun May 30 16:45:09 2010 GMT Module: packages Tag: HEAD ---- Log message: - up to 2.0 beta9 - obsolete kde-ac260-lt.patch dropped
---- Files affected: packages/kshutdown: kshutdown-desktop.patch (1.5 -> 1.6) , kshutdown.spec (1.16 -> 1.17) ---- Diffs: ================================================================ Index: packages/kshutdown/kshutdown-desktop.patch diff -u packages/kshutdown/kshutdown-desktop.patch:1.5 packages/kshutdown/kshutdown-desktop.patch:1.6 --- packages/kshutdown/kshutdown-desktop.patch:1.5 Thu Feb 9 16:30:10 2006 +++ packages/kshutdown/kshutdown-desktop.patch Sun May 30 18:45:04 2010 @@ -1,9 +1,8 @@ ---- kshutdown-0.8.2/kshutdown/kshutdown.desktop 2006-02-09 15:51:47.000000000 +0100 -+++ kshutdown-0.8.2/kshutdown/kshutdown.desktop 2006-02-09 16:11:19.000000000 +0100 -@@ -15,4 +15,5 @@ - GenericName[pl]=Narzędzie do zamykania systemu - DocPath=kshutdown/index.html +--- kshutdown-2.0beta9/src/kshutdown.desktop.orig 2010-05-30 00:00:00.000000000 +0200 ++++ kshutdown-2.0beta9/src/kshutdown.desktop 2010-05-30 00:00:00.000000000 +0200 +@@ -35,4 +35,4 @@ Type=Application --Categories=KDE;Application;Utility + + # DOC: http://standards.freedesktop.org/menu-spec/latest/apa.html +-Categories=Utility; +Categories=Qt;KDE;Utility;System -+# vi: encoding=utf-8 ================================================================ Index: packages/kshutdown/kshutdown.spec diff -u packages/kshutdown/kshutdown.spec:1.16 packages/kshutdown/kshutdown.spec:1.17 --- packages/kshutdown/kshutdown.spec:1.16 Mon Nov 26 20:00:14 2007 +++ packages/kshutdown/kshutdown.spec Sun May 30 18:45:04 2010 @@ -1,20 +1,28 @@ # $Revision$, $Date$ +%define prever beta9 + Summary: KDE application for closing Linux Summary(pl.UTF-8): Aplikacja KDE do zamykania Linuksa Name: kshutdown -Version: 1.0.2 -Release: 1 +Version: 2.0 +Release: 0.%{prever}.1 License: GPL v2 Group: X11/Applications -Source0: http://dl.sourceforge.net/kshutdown/%{name}-%{version}.tar.bz2 -# Source0-md5: 3e945657f856adf367a18fc11cf25382 +Source0: http://dl.sourceforge.net/kshutdown/%{name}-source-%{version}%{prever}.zip +# Source0-md5: 4a8a8f5f5e8323cf23ff37078d182d4e Patch0: %{name}-desktop.patch -Patch1: kde-ac260-lt.patch URL: http://kshutdown.sourceforge.net/ +BuildRequires: QtDBus-devel +BuildRequires: QtGui-devel +BuildRequires: autoconf BuildRequires: automake -BuildRequires: kdelibs-devel +BuildRequires: automoc4 +BuildRequires: cmake +BuildRequires: gettext-devel +BuildRequires: kde4-kdebase-workspace-devel +BuildRequires: phonon-devel BuildRequires: rpmbuild(macros) >= 1.129 -Requires: kdelibs >= 3.3.0 +BuildRequires: unzip BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -24,23 +32,31 @@ KShutDown służy do zamykania lub restartowania systemu Linuks. %prep -%setup -q +%setup -q -n %{name}-%{version}%{prever} %patch0 -p1 -%patch1 -p1 %build -cp -f /usr/share/automake/config.* admin -%configure \ - --disable-rpath \ - --with-qt-libraries=%{_libdir} +install -d build +cd build +%cmake \ + -DCMAKE_BUILD_TYPE=%{!?debug:Release}%{?debug:Debug} \ + -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DSYSCONF_INSTALL_DIR=%{_sysconfdir} \ + -LIBTIDY_INCLUDE_DIR=%{_includedir} \ +%if "%{_lib}" == "lib64" + -DLIB_SUFFIX=64 \ +%endif + ../ + %{__make} %install rm -rf $RPM_BUILD_ROOT -%{__make} install \ +%{__make} -C build install \ DESTDIR=$RPM_BUILD_ROOT \ - kde_htmldir=%{_kdedocdir} + kde_htmldir=%{_kdedocdir} \ + kde_libs_htmldir=%{_kdedocdir} %find_lang %{name} --with-kde @@ -49,14 +65,11 @@ %files -f %{name}.lang %defattr(644,root,root,755) -%doc AUTHORS ChangeLog README TODO +%doc ChangeLog TODO %attr(755,root,root) %{_bindir}/kshutdown -%{_datadir}/apps/kconf_update/kshutdown.upd -%{_libdir}/kde3/kshutdown* %{_datadir}/apps/kshutdown -%{_iconsdir}/hicolor/*/apps/kshutdown.png -%{_desktopdir}/*.desktop -%{_datadir}/apps/kicker/applets/kshutdownlockout.desktop +%{_desktopdir}/kde4/*.desktop +%{_iconsdir}/hicolor/*/apps/kshutdown.* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -64,6 +77,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.17 2010/05/30 16:45:04 august84 +- up to 2.0 beta9 +- obsolete kde-ac260-lt.patch dropped + Revision 1.16 2007/11/26 19:00:14 shadzik - 1.0.2 - rel 1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kshutdown/kshutdown-desktop.patch?r1=1.5&r2=1.6&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kshutdown/kshutdown.spec?r1=1.16&r2=1.17&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
