diff --git a/bootcrypto_filestousr.diff b/bootcrypto_filestousr.diff deleted file mode 100644 index 6fc4827..0000000 --- a/bootcrypto_filestousr.diff +++ /dev/null @@ -1,15 +0,0 @@ -Index: boot.crypto-0_201110101134/Makefile -=================================================================== ---- boot.crypto-0_201110101134.orig/Makefile.orig -+++ boot.crypto-0_201110101134/Makefile -@@ -1,8 +1,8 @@ - initscriptdir=/etc/init.d --pkglibdir=/lib/cryptsetup -+pkglibdir=/usr/lib/cryptsetup - mandir=/usr/share/man - sysconfdir=/etc --initrdscriptsdir=/lib/mkinitrd/scripts -+initrdscriptsdir=/usr/lib/mkinitrd/scripts - sbindir=/usr/sbin - - ASCIIDOC=asciidoc diff --git a/cryptsetup.changes b/cryptsetup.changes index 7a6424b..734fb74 100644 --- a/cryptsetup.changes +++ b/cryptsetup.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Sat Feb 4 15:21:14 UTC 2012 - rschweikert@suse.com - -- place everything in /usr tree (UsrMerge project) - ------------------------------------------------------------------- Fri Dec 16 13:06:18 UTC 2011 - jengelh@medozas.de diff --git a/cryptsetup.spec b/cryptsetup.spec index 83f3c98..2830a4b 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,7 +1,7 @@ # # spec file for package cryptsetup # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,24 +20,20 @@ %define ver %version%{?beta:-%beta} Name: cryptsetup -Url: http://code.google.com/p/cryptsetup/ -BuildRequires: device-mapper-devel -BuildRequires: e2fsprogs-devel -BuildRequires: libgcrypt-devel -BuildRequires: libselinux-devel +URL: http://code.google.com/p/cryptsetup/ +BuildRequires: device-mapper-devel e2fsprogs-devel libgcrypt-devel popt-devel +BuildRequires: libselinux-devel pkgconfig BuildRequires: libtool -BuildRequires: pkgconfig -BuildRequires: popt-devel # hashalot version %define haver 0.3 # boot.crypto version %define bcver 0_201110101134 -Version: 1.4.1 -Release: 0 -#Release: %{?beta:0.}.%{?beta:.}%{?beta} -Summary: Set Up dm-crypt Based Encrypted Block Devices License: GPL-2.0+ Group: System/Base +Version: 1.4.1 +Release: 2 +#Release: %{?beta:0.}.%{?beta:.}%{?beta} +Summary: Set Up dm-crypt Based Encrypted Block Devices Source: http://cryptsetup.googlecode.com/files/cryptsetup-%{ver}.tar.bz2 Source1: http://cryptsetup.googlecode.com/files/cryptsetup-%{ver}.tar.bz2.asc Source2: baselibs.conf @@ -54,7 +50,6 @@ Patch13: hashalot-timeout.diff Patch14: hashalot-manpage.diff Patch15: bug-476290_hashalot-hashlen.diff Patch16: hashalot-glibc210.diff -Patch17: bootcrypto_filestousr.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: aaa_base:/etc/init.d/boot.crypto Obsoletes: util-linux-crypto <= 2.12r @@ -71,6 +66,7 @@ includes support for automatically setting up encrypted volumes at boot time via the config file /etc/crypttab. %package -n libcryptsetup4 +License: GPL-2.0+ Summary: Set Up dm-crypt Based Encrypted Block Devices Group: System/Base @@ -82,6 +78,7 @@ includes support for automatically setting up encrypted volumes at boot time via the config file /etc/crypttab. %package -n libcryptsetup-devel +License: GPL-2.0+ Summary: Set Up dm-crypt Based Encrypted Block Devices Group: Development/Libraries/C and C++ # cryptsetup-devel last used 11.1 @@ -110,7 +107,7 @@ pushd ../hashalot-%haver %patch16 -p1 popd pushd ../boot.crypto-%bcver -%patch17 -p1 +#patch20 -p1 popd %build @@ -119,6 +116,8 @@ popd autoreconf -f -i test -e po/Makevars || cp po/Makevars.template po/Makevars %configure \ + --libdir=/%_lib \ + --bindir=/sbin --sbindir=/sbin \ --disable-static --enable-shared \ --enable-selinux make %{?_smp_mflags} @@ -127,33 +126,31 @@ make %{?_smp_mflags} pushd ../hashalot-%haver autoreconf -f -i %{?suse_update_config:%{suse_update_config}} -%configure +%configure --sbindir=/sbin make %{?_smp_mflags} popd %install make install DESTDIR=$RPM_BUILD_ROOT -rm -f $RPM_BUILD_ROOT/%_libdir/*.la +# move devel stuff to %%{libdir} +rm -f $RPM_BUILD_ROOT/%{_lib}/libcryptsetup.so +mkdir -p $RPM_BUILD_ROOT%{_libdir} +ln -s /%{_lib}/libcryptsetup.so.4 $RPM_BUILD_ROOT%{_libdir}/libcryptsetup.so +mv $RPM_BUILD_ROOT/%_lib/pkgconfig $RPM_BUILD_ROOT/%_libdir +# don't want this file in /lib (FHS compat check), and can't move it to /usr/lib +rm -f $RPM_BUILD_ROOT/%_lib/*.la +# # hashalot install pushd ../hashalot-%haver make install DESTDIR=$RPM_BUILD_ROOT popd # remove unwanted symlinks -rm -f $RPM_BUILD_ROOT/%{_sbindir}/{rmd160,sha256,sha384,sha512} -## -## boot.crypto -make -C ../boot.crypto-* install DESTDIR=$RPM_BUILD_ROOT -ln -s /etc/init.d/boot.crypto $RPM_BUILD_ROOT/%{_sbindir}/rccrypto +rm -f $RPM_BUILD_ROOT/sbin/{rmd160,sha256,sha384,sha512} +# +# boot.crypto +make -C ../boot.crypto-* install DESTDIR=$RPM_BUILD_ROOT +ln -s /etc/init.d/boot.crypto $RPM_BUILD_ROOT/sbin/rccrypto # -#UsrMerge -mkdir -p $RPM_BUILD_ROOT/{lib,sbin} -ln -sf %{_sbindir}/{cryptsetup,hashalot} $RPM_BUILD_ROOT/sbin -ln -sf /etc/init.d/boot.crypto $RPM_BUILD_ROOT/sbin/rccrypto -pushd $RPM_BUILD_ROOT/usr/lib - ln -s mkinitdir ../../lib - ln -s cryptsetup ../../lib -popd -#EndUserMerge %find_lang %name --all-name %pre @@ -202,32 +199,25 @@ fi %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/cryptotab /etc/init.d/boot.crypto /etc/init.d/boot.crypto-early -%_sbindir/convert_cryptotab -%_sbindir/cryptsetup -%_sbindir/hashalot -%_sbindir/rccrypto -%dir /usr/lib/mkinitrd -%dir /usr/lib/mkinitrd/scripts -/usr/lib/mkinitrd/scripts/setup-luks.sh -/usr/lib/mkinitrd/scripts/boot-luks.sh -/usr/lib/mkinitrd/scripts/setup-luks2.sh -/usr/lib/mkinitrd/scripts/setup-luks_final.sh -/usr/lib/cryptsetup +%dir /lib/mkinitrd +%dir /lib/mkinitrd/scripts +/lib/mkinitrd/scripts/setup-luks.sh +/lib/mkinitrd/scripts/boot-luks.sh +/lib/mkinitrd/scripts/setup-luks2.sh +/lib/mkinitrd/scripts/setup-luks_final.sh +/usr/sbin/convert_cryptotab +/sbin/cryptsetup +/sbin/hashalot +/sbin/rccrypto %_mandir/man1/hashalot.1.gz %_mandir/man8/cryptsetup.8.gz %_mandir/man5/crypttab.5.gz %_mandir/man5/cryptotab.5.gz -#UsrMerge -/sbin/cryptsetup -/sbin/hashalot -/sbin/rccrypto /lib/cryptsetup -/lib/mkinitdir -#EndUserMerge %files -n libcryptsetup4 %defattr(-,root,root) -%_libdir/libcryptsetup.so.4* +/%_lib/libcryptsetup.so.4* %files -n libcryptsetup-devel %defattr(-,root,root)