diff options
| author | Yaakov Selkowitz <yselkowitz@users.sourceforge.net> | 2014-07-25 18:45:36 -0500 |
|---|---|---|
| committer | Yaakov Selkowitz <yselkowitz@users.sourceforge.net> | 2014-07-25 18:45:36 -0500 |
| commit | dab2c2ef2f61248973df4fa1ae8c9854cc1d73a3 (patch) | |
| tree | ea5588a1705252a80acef953c93bdead8fa4d871 | |
| parent | b6d64c084a1bfe5da21282c9dce450bb455352ad (diff) | |
| download | cygwin-libiconv-dab2c2ef2f61248973df4fa1ae8c9854cc1d73a3.tar.gz cygwin-libiconv-dab2c2ef2f61248973df4fa1ae8c9854cc1d73a3.tar.xz cygwin-libiconv-dab2c2ef2f61248973df4fa1ae8c9854cc1d73a3.zip | |
Cleanup spec
| -rw-r--r-- | cygwin-libiconv.spec | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/cygwin-libiconv.spec b/cygwin-libiconv.spec index 750a046..515702d 100644 --- a/cygwin-libiconv.spec +++ b/cygwin-libiconv.spec @@ -1,14 +1,13 @@ -%{cygwin_package_header} +%{?cygwin_package_header} Name: cygwin-libiconv Version: 1.14 -Release: 3 +Release: 4 Summary: GNU libraries and utilities for character set conversion License: GPLv2+ and LGPLv2+ Group: Development/Libraries URL: http://www.gnu.org/software/libiconv/ -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Source0: http://ftp.gnu.org/pub/gnu/libiconv/libiconv-%{version}.tar.gz @@ -18,10 +17,12 @@ Patch1: libiconv-1.14-reloc.patch BuildRequires: cygwin32-filesystem BuildRequires: cygwin32-gcc BuildRequires: cygwin32-binutils +BuildRequires: cygwin32 BuildRequires: cygwin64-filesystem BuildRequires: cygwin64-gcc BuildRequires: cygwin64-binutils +BuildRequires: cygwin64 BuildRequires: autoconf, automake, libtool, gettext-devel @@ -89,8 +90,6 @@ autoreconf -f -i -v -I `pwd`/m4 -I `pwd`/srcm4 %install -rm -rf $RPM_BUILD_ROOT - %cygwin_make install DESTDIR=$RPM_BUILD_ROOT # Remove documentation which duplicates what is already in @@ -115,10 +114,6 @@ rm -f $RPM_BUILD_ROOT%{cygwin64_bindir}/*.exe rm -f $RPM_BUILD_ROOT%{cygwin64_libdir}/charset.alias -%clean -rm -rf $RPM_BUILD_ROOT - - %files -n cygwin32-libiconv %doc COPYING COPYING.LIB %{cygwin32_bindir}/cygcharset-1.dll @@ -149,6 +144,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jul 25 2014 Yaakov Selkowitz <yselkowitz@cygwin.com> - 1.14-4 +- Cleanup spec + * Fri Jun 28 2013 Yaakov Selkowitz <cygwin-ports-general@lists.sourceforge.net> - 1.14-3 - Rebuild for new Cygwin packaging scheme. - Add cygwin64 support. |