[prev in list] [next in list] [prev in thread] [next in thread] 

List:       annvix-cvs
Subject:    [cvs] SVN commit in packages r7550 - in
From:       cvsrep () annvix ! org
Date:       2007-08-19 3:13:08
Message-ID: E1IMbDw-0001Qp-5f () hades ! annvix ! org
[Download RAW message or body]

Author: vdanen
Date: 2007-08-18 21:13:07 -0600 (Sat, 18 Aug 2007)
New Revision: 7550

Added:
   releases/2.1-CURRENT/device-mapper/SOURCES/device-mapper.1.02.09-mdv-pkgconfig.patch
Removed:
   releases/2.1-CURRENT/device-mapper/SOURCES/device-mapper.1.02.07-pk.patch
Modified:
   releases/2.1-CURRENT/device-mapper/SPECS/device-mapper.spec
Log:
- implement devel naming policy
- implement library provides policy
- always use dietlibc
- always build the eventd 
- update P2 to fix DM_LIB_VERSION for pkgconfig dependencies


Deleted: releases/2.1-CURRENT/device-mapper/SOURCES/device-mapper.1.02.07-pk.patch

Added: releases/2.1-CURRENT/device-mapper/SOURCES/device-mapper.1.02.09-mdv-pkgconfig.patch

Modified: releases/2.1-CURRENT/device-mapper/SPECS/device-mapper.spec
===================================================================
--- releases/2.1-CURRENT/device-mapper/SPECS/device-mapper.spec	2007-08-18 22:27:36 UTC (rev 7549)
+++ releases/2.1-CURRENT/device-mapper/SPECS/device-mapper.spec	2007-08-19 03:13:07 UTC (rev 7550)
@@ -13,30 +13,19 @@
 %define	extraversion	%{nil}
 %define	release		%_revrel
 
-%ifarch %{ix86} x86_64 ppc ppc64
-%define	use_dietlibc	1
-%else
-%define	use_dietlibc	0
-%endif
-
-%define	build_dmeventd	1
-
-%{?_with_dmeventd: %{expand: %%global build_dmeventd 1}}
-%{?_without_dmeventd: %{expand: %%global build_dmeventd 0}}
-%{?_with_dietlibc: %{expand: %%global use_dietlibc 1}}
-%{?_without_dietlibc: %{expand: %%global use_dietlibc 0}}
-
 %define	_sbindir	/sbin
 %define	major		1.02
 
-# Macro: %%{mklibname <name> [<major> [<minor>]] [-s] [-d]}
-%define	libname		%mklibname devmapper %major
-%define	dlibname	%mklibname devmapper %major -d
-%define	pdlibname	%mklibname devmapper -d
-%define	elibname	%mklibname devmapper-event %major
-%define	delibname	%mklibname devmapper-event %major -d
-%define	pdelibname	%mklibname devmapper-event -d
+# cannot build with SSP
+%define _ssp_cflags	%nil
 
+%define	libname		%mklibname devmapper %{major}
+%define	devname		%mklibname devmapper -d
+%define odevname	%mklibname devmapper -d 1.02
+%define	elibname	%mklibname devmapper-event %{major}
+%define	edevname	%mklibname devmapper-event -d
+%define	oedevname	%mklibname devmapper-event -d 1.02
+
 Summary:	Device mapper
 Name:		%{name}
 Version:	%{version}
@@ -46,16 +35,12 @@
 URL:		http://sources.redhat.com/dm/
 Source0:	ftp://sources.redhat.com/pub/dm/%{name}.%{version}%{extraversion}.tar.bz2
 Patch0:		device-mapper.1.02.07-build.patch
-Patch2:		device-mapper.1.02.07-pk.patch
+Patch2:		device-mapper.1.02.09-mdv-pkgconfig.patch
 Patch3:		device-mapper.1.02.09-misc.patch
 
 BuildRoot:	%{_buildroot}/%{name}-%{version}
 BuildRequires:	autoconf2.5 >= 2.53
-%if %{use_dietlibc}
 BuildRequires:	dietlibc-devel
-%else
-BuildRequires:	glibc-static-devel
-%endif
 
 %description
 The device-mapper driver enables the definition of new block
@@ -78,6 +63,7 @@
 %package -n %{libname}
 Summary:	Device mapper library
 Group:		System/Kernel and hardware
+Provides:	libdevmapper = %{version}-%{release}
 Requires(post):	ldconfig
 Requires(postun): ldconfig
 
@@ -90,17 +76,17 @@
 programs which use device-mapper.
 
 
-%package -n %{dlibname}
+%package -n %{devname}
 Summary:	Device mapper development library
 Group:		Development/C
-Provides:	device-mapper-devel = %{version}-%{release}
+Provides:	%{name}-devel = %{version}-%{release}
 Provides:	libdevmapper-devel = %{version}-%{release}
-Provides:	%{pdlibname} = %{version}-%{release}
+Obsoletes:	%{odevname}
 Requires:	%{libname} = %{version}-%{release}
 Requires:	pkgconfig
 Conflicts:	device-mapper-devel < %{version}-%{release}
 
-%description -n %{dlibname}
+%description -n %{devname}
 The device-mapper driver enables the definition of new block
 devices composed of ranges of sectors of existing devices.  This
 can be used to define disk partitions - or logical volumes.
@@ -109,10 +95,10 @@
 for building programs which use device-mapper.
 
 
-%if %{build_dmeventd}
 %package -n %{elibname}
 Summary:	Device mapper event library
 Group:		System/Kernel and hardware
+Provides:	libdevmapper-event = %{version}-%{release}
 Requires(post):	ldconfig
 Requires(postun): ldconfig
 
@@ -123,23 +109,22 @@
 programs which use device-mapper-event.
 
 
-%package -n %{delibname}
+%package -n %{edevname}
 Summary:	Device mapper event development library
 Group:		Development/C
-Provides:	device-mapper-event-devel = %{version}-%{release}
+Provides:	%{name}-event-devel = %{version}-%{release}
 Provides:	libdevmapper-event-devel = %{version}-%{release}
-Provides:	%{pdelibname} = %{version}-%{release}
+Obsoletes:	%{oedevname}
 Requires:	%{elibname} = %{version}-%{release}
-Requires:	%{dlibname} = %{version}-%{release}
+Requires:	%{devname} = %{version}-%{release}
 Requires:	pkgconfig
 Conflicts:	device-mapper-event-devel < %{version}-%{release}
 
-%description -n %{delibname}
+%description -n %{edevname}
 The device-mapper-event library allows monitoring of active mapped devices.
 
 This package contains the header files and development libraries
 for building programs which use device-mapper-event.
-%endif
 
 
 %package doc
@@ -153,39 +138,27 @@
 %prep
 %setup -q -n %{name}.%{version}%{extraversion}
 %patch0 -p1 -b .build
-%patch2 -p1 -b .pkg
+%patch2 -p1 -b .pkgconfig
 %patch3 -p1 -b .misc
 autoconf
 
 
 %build
-%if %{use_dietlibc}
 %ifarch x86_64
 CC="x86_64-annvix-linux-gnu-gcc"
 %else
 CC="gcc"
 %endif
-%endif
 
 %configure2_5x \
     --with-user=`id -un` \
     --with-group=`id -gn` \
-%if %{use_dietlibc}
     --enable-static_link_dietlibc \
-%else
-    --enable-static_link \
-%endif
     --disable-selinux \
-%if %{build_dmeventd}
     --enable-dmeventd \
-%endif
     --enable-pkgconfig \
 
-%if %{use_dietlibc}
 %make CC="${CC}"
-%else
-%make
-%endif
 
 
 %install
@@ -194,9 +167,7 @@
 mkdir -p %{buildroot}/%{_lib}
 mv %{buildroot}%{_libdir}/libdevmapper.so.* %{buildroot}/%{_lib}
 ln -sf /%{_lib}/libdevmapper.so.%{major} %{buildroot}%{_libdir}/libdevmapper.so
-%if %{use_dietlibc}
 mv %{buildroot}%{_sbindir}/dmsetup-static{-diet,}
-%endif
 chmod -R u+w %{buildroot} #else brp won't strip binaries
 
 
@@ -208,10 +179,8 @@
 %postun -n %{libname} -p /sbin/ldconfig
 
 
-%if %{build_dmeventd}
 %post -n %{elibname} -p /sbin/ldconfig
 %postun -n %{elibname} -p /sbin/ldconfig
-%endif
 
 
 %files -n dmsetup
@@ -224,28 +193,24 @@
 %defattr(755,root,root)
 /%{_lib}/libdevmapper.so.*
 
-%files -n %{dlibname}
+%files -n %{devname}
 %defattr(644,root,root,755)
 %{_libdir}/libdevmapper.so
 %{_libdir}/libdevmapper.a*
 %{_includedir}/libdevmapper.h
-%if %{use_dietlibc}
 %{_libdir}/libdevmapper-diet.a*
-%endif
 %{_libdir}/pkgconfig/devmapper.pc
 
-%if %{build_dmeventd}
 %defattr(755,root,root)
 %files -n %{elibname}
 %{_libdir}/libdevmapper-event.so.*
 
-%files -n %{delibname}
+%files -n %{edevname}
 %defattr(644,root,root,755)
 %{_includedir}/libdevmapper-event.h
 %{_libdir}/libdevmapper-event.so
 %{_libdir}/libdevmapper-event.a*
 %{_libdir}/pkgconfig/devmapper-event.pc
-%endif
 
 %files doc
 %defattr(-,root,root)
@@ -256,6 +221,13 @@
 
 
 %changelog
+* Sat Aug 18 2007 Vincent Danen <vdanen-at-build.annvix.org> 1.02.09
+- implement devel naming policy
+- implement library provides policy
+- always use dietlibc
+- always build the eventd
+- update P2 to fix DM_LIB_VERSION for pkgconfig dependencies
+
 * Thu Dec 28 2006 Vincent Danen <vdanen-at-build.annvix.org> 1.02.09
 - 1.02.09
 - updated P3 from Mandriva


_______________________________________________
cvs mailing list
cvs@annvix.org
http://annvix.org/mailman/listinfo/cvs

[prev in list] [next in list] [prev in thread] [next in thread]

Configure | About | News | Add a list | Sponsored by KoreLogic