[skanlite] s/kdegraphics-devel/pkgconfig(libksane)/ use desktop-file-validate

Rex Dieter rdieter at fedoraproject.org
Fri Jul 1 15:09:26 UTC 2011


commit b72741e8fdcac2e67274ee1952a512082cc824d7
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Jul 1 10:09:15 2011 -0500

    s/kdegraphics-devel/pkgconfig(libksane)/
    use desktop-file-validate

 skanlite.spec |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/skanlite.spec b/skanlite.spec
index 8e731d3..46c325c 100644
--- a/skanlite.spec
+++ b/skanlite.spec
@@ -1,6 +1,6 @@
 Name:           skanlite
 Version:        0.7
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Lightweight scanning program
 Group:          Applications/Productivity
 # Actually: GPLv2 or GPLv3 or any later Version approved by KDE e.V.
@@ -11,8 +11,8 @@ Source0:        http://sourceforge.net/projects/sanewidget/files/Skanlite/%{name
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gettext
-BuildRequires: kdelibs4-devel >= 4.4.0
-BuildRequires: kdegraphics-devel >= 4.4.0
+BuildRequires: kdelibs4-devel
+BuildRequires: pkgconfig(libksane) 
 
 %{?_kde4_version:Requires: kdelibs4 >= %{_kde4_version}}
 
@@ -31,24 +31,24 @@ popd
 make %{?_smp_mflags} -C %{_target_platform}
 
 %install
-#mkdir -p %{buildroot}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-# validate desktop file
-desktop-file-install \
-        --dir="%{buildroot}%{_datadir}/applications/kde4" \
-        %{buildroot}%{_datadir}/applications/kde4/%{name}.desktop
-
-
 %find_lang %{name} --with-kde 
 
+%check
+desktop-file-validate %{buildroot}%{_datadir}/applications/kde4/skanlite.desktop
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING TODO
-%{_kde4_bindir}/%{name}
-%{_kde4_datadir}/applications/kde4/%{name}.desktop
+%{_kde4_bindir}/skanlite
+%{_kde4_datadir}/applications/kde4/skanlite.desktop
 
 %changelog
+* Fri Jul 01 2011 Rex Dieter <rdieter at fedoraproject.org> 0.7-3
+- s/kdegraphics-devel/pkgconfig(libksane)/
+- use desktop-file-validate
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 


More information about the scm-commits mailing list