[gnomint] New upstream release and spec cleanups

[verdurin]

commit 3f6073f72ff5c0a8f21cc6fe95c8c53787704e23
Author: Adam Huffman <bloch at verdurin.com>
Date:   Fri Aug 27 10:45:30 2010 +0100

    New upstream release and spec cleanups

 gnomint.spec |   28 ++++++++++++++++------------
 1 files changed, 16 insertions(+), 12 deletions(-)
---
diff --git a/gnomint.spec b/gnomint.spec
index ebe95c2..739d9a9 100644
--- a/gnomint.spec
+++ b/gnomint.spec
@@ -1,15 +1,13 @@
 Name:		gnomint
-Version:	1.1.0
-Release:	2%{?dist}
+Version:	1.2.1
+Release:	1%{?dist}
 Summary:	Graphical x509 Certification Authority management tool
 
 Group:		Applications/System
 License:	GPLv3+
 URL:		http://gnomint.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0:		%{name}-%{version}-cflags.patch
-Patch1:		%{name}-%{version}-DSO-libgcrypt.patch
-
+Patch0:		%{name}-%{version}-DSO-libgcrypt.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gnutls-devel >= 2
@@ -34,25 +32,24 @@ GTK/Gnome environments.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %configure --disable-dependency-tracking --disable-schemas-install
-make %{?_smp_mflags}
+make %{?_smp_mflags} CFLAGS="%{optflags}"
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot} INSTALL="install -p"
 desktop-file-install --delete-original \
   --remove-category=Application \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+  --dir %{buildroot}%{_datadir}/applications \
+  %{buildroot}%{_datadir}/applications/%{name}.desktop
 
 %find_lang %{name}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %pre
 if [ "$1" -gt 1 ]; then
@@ -96,6 +93,13 @@ update-desktop-database %{_datadir}/applications || :
 %{_datadir}/%{name}/*.ui
 
 %changelog
+* Fri Aug 27 2010 Adam Huffman <bloch at verdurin.com> - 1.2.1-1
+- new upstream feature and bugfix release
+  - full changelog at http://gnomint.sourceforge.net/?q=node
+- use macros consistently
+- drop cflags patch
+- fix cflags via install section
+
 * Sun Feb 14 2010 Adam Huffman <bloch at verdurin.com> - 1.1.0-2
 - fix for DSO linking error