[units] new upstream release - 2.00

[Kamil Dudka]

commit 7fa522b1c0f595b54d4e7daf9b644571e2db8470
Author: Kamil Dudka <kdudka at redhat.com>
Date:   Mon Jul 2 11:04:34 2012 +0200

    new upstream release - 2.00

 .gitignore                    |    1 +
 sources                       |    2 +-
 units-1.88-coverity.patch     |   97 -----------------------------------------
 units-1.88-man-typo.patch     |   16 -------
 units-1.88.tar.gz.sig         |  Bin 72 -> 0 bytes
 units-2.00-make-install.patch |   43 ++++++++++++++++++
 units-2.00.tar.gz.sig         |  Bin 0 -> 72 bytes
 units.spec                    |   16 ++++---
 8 files changed, 54 insertions(+), 121 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 017b085..b3cb273 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 units-1.88.tar.gz
+/units-2.00.tar.gz
diff --git a/sources b/sources
index e86a38c..05995d8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9b2ee6e7e0e9c62741944cf33fc8a656  units-1.88.tar.gz
+6d0518d493f9bab5aa318a3c7d0801b2  units-2.00.tar.gz
diff --git a/units-2.00-make-install.patch b/units-2.00-make-install.patch
new file mode 100644
index 0000000..658ebc8
--- /dev/null
+++ b/units-2.00-make-install.patch
@@ -0,0 +1,43 @@
+From adfae89daffafd4f1a07dcc2a6f4689cf07c2b54 Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka at redhat.com>
+Date: Mon, 2 Jul 2012 11:16:13 +0200
+Subject: [PATCH] Makefile.in: do not ignore $(DESTDIR) when installing data
+
+---
+ Makefile.in |   13 +++++++------
+ 1 files changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 60b8966..111f4e7 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -84,10 +84,10 @@ units_cur_inst: units_cur
+ 	sed -e "s:outfile = 'currency.units':outfile='@UDAT at currency.units':" units_cur > units_cur_inst
+ 
+ install-support: definitions.units currency.units units_cur_inst
+-	$(srcdir)/mkinstalldirs @UDAT@  $(DESTDIR)$(bindir) 
+-	$(INSTALL_DATA) $(srcdir)/definitions.units @UDAT at definitions.units
+-	$(INSTALL_DATA) $(srcdir)/currency.units @UDAT at currency.units
+-	$(INSTALL_DATA) $(srcdir)/locale.map @UDAT at locale.map
++	$(srcdir)/mkinstalldirs $(DESTDIR)@UDAT@ $(DESTDIR)$(bindir) 
++	$(INSTALL_DATA) $(srcdir)/definitions.units $(DESTDIR)@UDAT at definitions.units
++	$(INSTALL_DATA) $(srcdir)/currency.units $(DESTDIR)@UDAT at currency.units
++	$(INSTALL_DATA) $(srcdir)/locale.map $(DESTDIR)@UDAT at locale.map
+ 	$(INSTALL_PROGRAM) units_cur_inst $(DESTDIR)$(bindir)/`echo units_cur|sed '$(transform)'`
+ 
+ install: units at EXEEXT@ install-doc install-support
+@@ -138,8 +138,9 @@ Makefile: Makefile.in config.status
+ uninstall: 
+ 	-rm -f $(DESTDIR)$(bindir)/`echo units at EXEEXT@|sed '$(transform)'` \
+ 	       $(DESTDIR)$(mandir)/man1/`echo units|sed '$(transform)'`.1 \
+-	       $(DESTDIR)$(infodir)/units.info @UDAT at definitions.units \
+-	       @UDAT at currency.units \
++	       $(DESTDIR)$(infodir)/units.info \
++	       $(DESTDIR)@UDAT at definitions.units \
++	       $(DESTDIR)@UDAT at currency.units \
+ 	@if test -f $(DESTDIR)$(infodir)/dir; then \
+ 	  echo You may need to remove units.info from $(DESTDIR)$(infodir)/dir; \
+ 	else true; fi
+-- 
+1.7.1
+
diff --git a/units-2.00.tar.gz.sig b/units-2.00.tar.gz.sig
new file mode 100644
index 0000000..2fdcbfe
Binary files /dev/null and b/units-2.00.tar.gz.sig differ
diff --git a/units.spec b/units.spec
index d17ae75..1d25d06 100644
--- a/units.spec
+++ b/units.spec
@@ -1,7 +1,7 @@
 Summary: A utility for converting amounts from one unit to another
 Name: units
-Version: 1.88
-Release: 6%{?dist}
+Version: 2.00
+Release: 1%{?dist}
 Source: ftp://ftp.gnu.org/gnu/units/%{name}-%{version}.tar.gz
 URL: http://www.gnu.org/software/units/units.html
 License: GPLv3+
@@ -12,8 +12,7 @@ Requires(preun): /sbin/install-info
 BuildRequires: bison
 BuildRequires: ncurses-devel
 BuildRequires: readline-devel
-Patch1: units-1.88-man-typo.patch
-Patch2: units-1.88-coverity.patch
+Patch0: units-2.00-make-install.patch
 
 %description
 Units converts an amount from one unit to another, or tells you what
@@ -23,8 +22,7 @@ well as conversions such as Fahrenheit to Celsius.
 
 %prep
 %setup -q
-%patch1 -p1
-%patch2 -p1
+%patch0 -p1
 
 %build
 %configure
@@ -54,11 +52,15 @@ fi
 %defattr(-,root,root,-)
 %doc ChangeLog COPYING NEWS README
 %{_bindir}/*
-%{_datadir}/units.dat
+%{_datadir}/units
 %{_infodir}/*
 %{_mandir}/man1/*
 
 %changelog
+* Mon Jun 02 2012 Kamil Dudka <kdudka at redhat.com> - 2.00-1
+- new upstream release, dropped applied patches
+- patch Makefile.in to respect $(DESTDIR)
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.88-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild