SPECS: crossmingw32-gettext.spec - clean ups

[czarny]

Author: czarny                       Date: Tue Feb 20 18:13:55 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- clean ups

---- Files affected:
SPECS:
   crossmingw32-gettext.spec (1.24 -> 1.25) 

---- Diffs:

================================================================
Index: SPECS/crossmingw32-gettext.spec
diff -u SPECS/crossmingw32-gettext.spec:1.24 SPECS/crossmingw32-gettext.spec:1.25
--- SPECS/crossmingw32-gettext.spec:1.24	Mon Feb 12 22:23:51 2007
+++ SPECS/crossmingw32-gettext.spec	Tue Feb 20 19:13:50 2007
@@ -1,26 +1,23 @@
 # $Revision$, $Date$
 #
-# Conditional build:
-%bcond_without	asprintf	# without libasprintf (in C++)
-#
-%define		realname		gettext
 Summary:	gettext libraries - cross mingw32 version
 Summary(pl.UTF-8):	Biblioteki gettext - wersja skrośna dla mingw32
-Name:		crossmingw32-%{realname}
+%define		_realname		gettext
+Name:		crossmingw32-%{_realname}
 Version:	0.16.1
 Release:	1
 License:	LGPL
 Group:		Libraries
-Source0:	ftp://ftp.gnu.org/gnu/gettext/%{realname}-%{version}.tar.gz
+Source0:	ftp://ftp.gnu.org/gnu/gettext/%{_realname}-%{version}.tar.gz
 # Source0-md5:	3d9ad24301c6d6b17ec30704a13fe127
-Patch0:		%{realname}-info.patch
-Patch1:		%{realname}-killkillkill.patch
+Patch0:		%{_realname}-info.patch
+Patch1:		%{_realname}-killkillkill.patch
 Patch2:		%{name}.patch
 URL:		http://www.gnu.org/software/gettext/
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake >= 1:1.10
 BuildRequires:	crossmingw32-gcc
-%{?with_asprintf:BuildRequires:	crossmingw32-gcc-c++}
+BuildRequires:	crossmingw32-gcc-c++
 BuildRequires:	crossmingw32-libiconv
 BuildRequires:	libtool
 BuildRequires:	texinfo
@@ -31,9 +28,13 @@
 
 %define		target			i386-mingw32
 %define		target_platform 	i386-pc-mingw32
+%define		arch			%{_prefix}/%{target}
+%define		gccarch			%{_prefix}/lib/gcc-lib/%{target}
+%define		gcclib			%{_prefix}/lib/gcc-lib/%{target}/%{version}
+
 %define		_sysprefix		/usr
 %define		_prefix			%{_sysprefix}/%{target}
-
+%define		_pkgconfigdir		%{_prefix}/lib/pkgconfig
 %define		__cc			%{target}-gcc
 %define		__cxx			%{target}-g++
 
@@ -44,12 +45,15 @@
 Biblioteki gettext - wersja skrośna dla mingw32.
 
 %prep
-%setup -q -n %{realname}-%{version}
+%setup -q -n %{_realname}-%{version}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 
 %build
+export PKG_CONFIG_PATH=%{_prefix}/lib/pkgconfig
+export AR="%{target}-ar"
+export RANLIB="%{target}-ranlib"
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
@@ -65,8 +69,6 @@
 cd ..
 
 %configure \
-	AR="%{target}-ar" \
-	RANLIB="%{target}-ranlib" \
 	--target=%{target} \
 	--host=%{target_platform} \
 	--disable-csharp \
@@ -89,14 +91,12 @@
 
 %files
 %defattr(644,root,root,755)
-%{_bindir}/libintl-8.dll
-%{_libdir}/libintl.dll.a
+#%{_bindir}/libintl-8.dll
+#%{_libdir}/libintl.dll.a
 %{_libdir}/libintl.la
-%if %{with asprintf}
 %{_bindir}/libasprintf-0.dll
 %{_libdir}/libasprintf.dll.a
 %{_libdir}/libasprintf.la
-%endif
 %{_includedir}/*.h
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -105,6 +105,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25  2007/02/20 18:13:50  czarny
+- clean ups
+
 Revision 1.24  2007/02/12 21:23:51  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/crossmingw32-gettext.spec?r1=1.24&r2=1.25&f=u