[ascii-design/f20] Use CMake now.
Christopher Meng
cicku at fedoraproject.org
Wed Jun 18 06:53:48 UTC 2014
commit 1a82611baca2b599e375c80e2a68a0ca71fff5b2
Author: Christopher Meng <i at cicku.me>
Date: Wed Jun 18 14:53:24 2014 +0800
Use CMake now.
ascii-design.spec | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/ascii-design.spec b/ascii-design.spec
index f600c20..7c65d30 100644
--- a/ascii-design.spec
+++ b/ascii-design.spec
@@ -6,6 +6,7 @@ License: GPLv2
URL: http://ascii-design.sourceforge.net
Source0: http://downloads.sourceforge.net/project/%{name}/%{name}/Ascii-Design%20%{version}/%{name}-%{version}.tar.bz2
BuildRequires: appdata-tools
+BuildRequires: cmake
BuildRequires: desktop-file-utils
BuildRequires: qt4-devel
Requires: figlet
@@ -24,22 +25,21 @@ sed -i 's/\r$//' COPYING.TXT
%build
# Using Qt4 for a while
-%qmake_qt4
+mkdir build && build
+%cmake ..
make %{?_smp_mflags}
%install
-install -pDm755 bin/%{name} %{buildroot}%{_bindir}/%{name}
-desktop-file-install --dir=%{buildroot}%{_datadir}/applications icon/%{name}.desktop
-
-install -pDm644 pics/%{name}.png %{buildroot}%{_datadir}/pixmaps/%{name}.png
+%make_install
%check
-appdata-validate --nonet %{buildroot}%{_datadir}/appdata/ascii-design.appdata.xml
+desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
+appdata-validate --nonet %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
%files
%doc COPYING.TXT README.md
%{_bindir}/%{name}
-%{_datadir}/appdata/ascii-design.appdata.xml
+%{_datadir}/appdata/%{name}.appdata.xml
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/%{name}.png
More information about the scm-commits
mailing list