new upstream release - 2.01

This commit is contained in:
Kamil Dudka 2012-10-25 10:51:23 +02:00
parent bcbbd7c352
commit 03d144beeb
6 changed files with 7 additions and 48 deletions

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
units-1.88.tar.gz
/units-2.00.tar.gz
/units-2.01.tar.gz

View File

@ -1 +1 @@
6d0518d493f9bab5aa318a3c7d0801b2 units-2.00.tar.gz
81bf85937c56fbbd04b16f2f3f9d8526 units-2.01.tar.gz

View File

@ -1,43 +0,0 @@
From adfae89daffafd4f1a07dcc2a6f4689cf07c2b54 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@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@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@definitions.units
- $(INSTALL_DATA) $(srcdir)/currency.units @UDAT@currency.units
- $(INSTALL_DATA) $(srcdir)/locale.map @UDAT@locale.map
+ $(srcdir)/mkinstalldirs $(DESTDIR)@UDAT@ $(DESTDIR)$(bindir)
+ $(INSTALL_DATA) $(srcdir)/definitions.units $(DESTDIR)@UDAT@definitions.units
+ $(INSTALL_DATA) $(srcdir)/currency.units $(DESTDIR)@UDAT@currency.units
+ $(INSTALL_DATA) $(srcdir)/locale.map $(DESTDIR)@UDAT@locale.map
$(INSTALL_PROGRAM) units_cur_inst $(DESTDIR)$(bindir)/`echo units_cur|sed '$(transform)'`
install: units@EXEEXT@ install-doc install-support
@@ -138,8 +138,9 @@ Makefile: Makefile.in config.status
uninstall:
-rm -f $(DESTDIR)$(bindir)/`echo units@EXEEXT@|sed '$(transform)'` \
$(DESTDIR)$(mandir)/man1/`echo units|sed '$(transform)'`.1 \
- $(DESTDIR)$(infodir)/units.info @UDAT@definitions.units \
- @UDAT@currency.units \
+ $(DESTDIR)$(infodir)/units.info \
+ $(DESTDIR)@UDAT@definitions.units \
+ $(DESTDIR)@UDAT@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

Binary file not shown.

BIN
units-2.01.tar.gz.sig Normal file

Binary file not shown.

View File

@ -1,7 +1,7 @@
Summary: A utility for converting amounts from one unit to another
Name: units
Version: 2.00
Release: 4%{?dist}
Version: 2.01
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+
@ -11,7 +11,6 @@ Requires(preun): /sbin/install-info
BuildRequires: bison
BuildRequires: ncurses-devel
BuildRequires: readline-devel
Patch0: units-2.00-make-install.patch
%description
Units converts an amount from one unit to another, or tells you what
@ -21,7 +20,6 @@ well as conversions such as Fahrenheit to Celsius.
%prep
%setup -q
%patch0 -p1
%build
%configure
@ -53,6 +51,9 @@ fi
%{_mandir}/man1/*
%changelog
* Thu Oct 25 2012 Kamil Dudka <kdudka@redhat.com> - 2.01-1
- new upstream release
* Fri Sep 07 2012 Kamil Dudka <kdudka@redhat.com> - 2.00-4
- run the upstream smoke-test during build