[lookup] Cleanup spec, fix build
Peter Robinson
pbrobinson at fedoraproject.org
Sat Aug 17 15:47:57 UTC 2013
commit 67dff00092f7c8a6436c54f38a41e7f15da1b675
Author: Peter Robinson <pbrobinson at gmail.com>
Date: Sat Aug 17 16:47:43 2013 +0100
Cleanup spec, fix build
.gitignore | 1 +
lookup.spec | 24 +++++++++++-------------
sources | 2 +-
3 files changed, 13 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9fe85fb..87d69bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
*.bak
lookup-1.*
x86_64
+/lookup-2.0.tar.gz
diff --git a/lookup.spec b/lookup.spec
index 53340cd..c0873eb 100644
--- a/lookup.spec
+++ b/lookup.spec
@@ -1,7 +1,7 @@
Summary: A graphical tool to search DNS for answers
Name: lookup
Version: 2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
License: BSD
Group: Applications/Internet
URL: http://www.dnssec-tools.org/
@@ -10,8 +10,6 @@ Source1: COPYING-from-dnssec-tools.txt
Source2: lookup.desktop
Patch0: lookup-1.11.p2-dont-double-install.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
BuildRequires: qt-devel
BuildRequires: dnssec-tools-libs-devel >= 2.0
BuildRequires: openssl-devel
@@ -32,19 +30,17 @@ qmake-qt4 PREFIX=/usr
make %{?_smp_mflags}
%install
-rm -rf %{buildroot}
-
make install INSTALL_ROOT=%{buildroot}
-%{__rm} -f %{buildroot}%{_datadir}/pixmap/lookup.xpm
-%{__mkdir_p} %{buildroot}/%{_datadir}/icons/hicolor/64x64/apps/
-%{__install} -p -m 644 data/64x64/lookup.png %{buildroot}/%{_datadir}/icons/hicolor/64x64/apps/
+rm -f %{buildroot}%{_datadir}/pixmap/lookup.xpm
+mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/64x64/apps/
+install -p -m 644 data/64x64/lookup.png %{buildroot}/%{_datadir}/icons/hicolor/64x64/apps/
-%{__rm} -f %{buildroot}%{_datadir}/applications/hildon/lookup.desktop
+rm -f %{buildroot}%{_datadir}/applications/hildon/lookup.desktop
desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE2}
-%{__mkdir_p} %{buildroot}/%{_mandir}/man1
-%{__install} -p -D -m 644 man/lookup.1 %{buildroot}/%{_mandir}/man1/lookup.1
+mkdir -p %{buildroot}/%{_mandir}/man1
+install -p -D -m 644 man/lookup.1 %{buildroot}/%{_mandir}/man1/lookup.1
%post
touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
@@ -59,7 +55,6 @@ fi
gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
%files
-%defattr(-,root,root,-)
%doc COPYING
%doc %{_mandir}/man1/*
%{_bindir}/lookup
@@ -67,7 +62,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
%{_datadir}/applications/lookup.desktop
%changelog
-* Wed Feb 20 2013 Wes Hardaker <wjhns174 at hardakers.net> - 2.0-1
+* Sat Aug 17 2013 Peter Robinson <pbrobinson at fedoraproject.org> 2.0-2
+- Cleanup spec, fix build
+
+* Thu Aug 08 2013 Wes Hardaker <wjhns174 at hardakers.net> - 2.0-1
- 2.0 release
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.14-3
diff --git a/sources b/sources
index 0187c91..fb406fe 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f7378b45096e46dfd3d7ef08c5a9cff0 lookup-1.14.tar.gz
+d5f024f3d40089e5aade6dd07873e982 lookup-2.0.tar.gz
More information about the scm-commits
mailing list