- fix:getopt_long removed from klibc

- STBR for Th

Changed files:
    device-mapper-getopt.patch -> 1.1
    device-mapper.spec -> 1.47

diff --git a/device-mapper-getopt.patch b/device-mapper-getopt.patch
new file mode 100644 (file)
index 0000000..750e66f
--- /dev/null
+++ b/device-mapper-getopt.patch
@@ -0,0 +1,11 @@
+--- device-mapper.1.01.05/configure.in.orig    2006-01-24 22:48:51.000000000 +0100
++++ device-mapper.1.01.05/configure.in 2006-01-24 22:49:47.000000000 +0100
+@@ -208,7 +208,7 @@
+ 
+ ################################################################################
+ dnl -- Check for getopt
+-AC_CHECK_HEADERS(getopt.h, CFLAGS="$CFLAGS -DHAVE_GETOPTLONG")
++AC_CHECK_HEADERS(getopt.h)
+ 
+ ################################################################################
+ dnl -- Internationalisation stuff

diff --git a/device-mapper.spec b/device-mapper.spec
index e10f5d3a26349e8e74e6cbeebbca92e53c685817..541109573d9388f82a9de3b2dfdf65f9b08c586b 100644 (file)
--- a/device-mapper.spec
+++ b/device-mapper.spec
@@ -7,7 +7,7 @@ Summary:        Userspace support for the device-mapper
 Summary(pl):   Wsparcie dla mapowania urz±dzeñ w przestrzeni u¿ytkownika
 Name:          device-mapper
 Version:       1.01.05
-Release:       1
+Release:       2
 License:       GPL v2
 Group:         Applications/System
 Source0:       ftp://sources.redhat.com/pub/dm/%{name}.%{version}.tgz
@@ -16,6 +16,7 @@ Patch0:               %{name}-stack.patch
 # http://www.redhat.com/archives/dm-devel/2005-March/msg00022.html
 Patch1:                %{name}-disable_dynamic_link.patch
 Patch2:                %{name}-klibc.patch
+Patch3:                %{name}-getopt.patch
 URL:           http://sources.redhat.com/dm/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -114,6 +115,7 @@ Dodatkowe skrypty.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 cp -f /usr/share/automake/config.sub autoconf
@@ -140,7 +142,7 @@ cp -a lib/ioctl/libdevmapper.a initrd-libdevmapper.a
 
 %configure \
        --%{?with_selinux:en}%{!?with_selinux:dis}able-selinux \
-       --with-optimisation="%{rpmcflags}" \
+       --with-optimisation="%{rpmcflags} -DHAVE_GETOPTLONG" \
        --with-user=%(id -u) \
        --with-group=%(id -g) \
        --with-interface=ioctl \