* cryptsetup: updated to 1.4.1

* dialog: updated to 1.1


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@5968 ec354946-7b23-47d6-9f5a-488ba84defc7

c/cryptsetup/cryptsetup-vl.spec

@@ -1,93 +1,300 @@
-Summary: A utility for setting up encrypted filesystems
+%define _root_sbindir /sbin
-Name: cryptsetup
+%define upstream_version %{version}
-Version: 1.0.5
+
-Release: 8%{?_dist_release}
+Summary:	A utility for setting up encrypted disks
-License: GPLv2
+Summary(ja):	暗号化ファイルシステム設定用ユーティリティ
-Group: Applications/System
+Name:		cryptsetup
-URL: http://luks.endorphin.org/
+Version:	1.4.1
-Source: http://luks.endorphin.org/source/cryptsetup-%{version}.tar.bz2
+Release:	3%{?_dist_release}
-Patch: cryptsetup-luks-1.0.1-proto.patch
+License:	GPLv2 and LGPLv2+
-Patch1: cryptsetup-1.0.5-readonly_detection.patch
+Group:		Applications/System
-Patch3: cryptsetup-1.0.5-luksInit_header.patch
+URL:		http://cryptsetup.googlecode.com/
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	libgcrypt-devel, popt-devel, device-mapper-devel
-BuildRequires: libgcrypt-devel, popt, device-mapper-devel
+BuildRequires:	libgpg-error-devel, libuuid-devel
-BuildRequires: libgpg-error-devel, e2fsprogs-devel
+BuildRequires:	python-devel
-#BuildRequires: recode
+Provides:	cryptsetup-luks = %{version}-%{release}
-Provides: cryptsetup-luks = %{version}-%{release}
+Obsoletes:	cryptsetup-luks < 1.4.0
-Obsoletes: cryptsetup-luks
+Requires:	cryptsetup-libs = %{version}-%{release}
-
+Source0:	http://cryptsetup.googlecode.com/files/cryptsetup-%{upstream_version}.tar.bz2
 
 %description
-This package contains cryptsetup, a utility for setting up
+The cryptsetup package contains a utility for setting up
-encrypted filesystems using Device Mapper and the dm-crypt target.
+disk encryption using dm-crypt kernel module.
+
+%description -l ja
+cryptsetup パッケージには、dm-crypt カーネルモジュールを使って
+ディスクの暗号化を設定するユーティリティが収録されています。
 
 
 %package devel
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: libgcrypt-devel > 1.1.42, device-mapper-devel, e2fsprogs-devel
+Requires: libgcrypt-devel > 1.1.42, device-mapper-devel, libuuid-devel
-Summary: Headers and libraries for using encrypted filesystems
+Requires: pkgconfig
-
+Summary: Headers and libraries for using encrypted file systems
+Summary(ja): 暗号化ファイルシステムを使うためのヘッダとライブラリ
+Provides: cryptsetup-luks-devel = %{version}-%{release}
+Obsoletes: cryptsetup-luks-devel < 1.4.0
 
 %description devel
-The cryptsetup-luks-devel package contain libraries and header files
+The cryptsetup-devel package contains libraries and header files
-used for writing code that makes use of encrypted filesystems.
+used for writing code that makes use of disk encryption.
+
+%description devel -l ja
+cryptsetup-devel パッケージには、ディスクの暗号化を使うコードを
+書くのに使われるライブラリとヘッダファイルが収録されています。
+
+
+%package libs
+Group: System Environment/Libraries
+Summary: Cryptsetup shared library
+Summary(ja): Cryptsetup 共有ライブラリ
+Provides: cryptsetup-luks-libs = %{version}-%{release}
+Obsoletes: cryptsetup-luks-libs < 1.4.0
+
+%description libs
+This package contains the cryptsetup shared library, libcryptsetup.
+
+%description libs -l ja
+このパッケージには、cryptsetup の共有ライブラリ、libcryptsetup が
+収録されています。
+
+
+%package python
+Group: System Environment/Libraries
+Summary: Python bindings for libcryptsetup
+Summary(ja): libcryptsetup の Python バインディング
+Requires: %{name}-libs = %{version}-%{release}
+Provides: python-cryptsetup = %{version}-%{release}
+Obsoletes: python-cryptsetup < 1.4.0
+
+%description python
+This package provides Python bindings for libcryptsetup, a library
+for setting up disk encryption using dm-crypt kernel module.
+
+%description python -l ja
+このパッケージには、dm-crypt カーネルモジュールを使って
+ディスクの暗号化を設定するライブラリ libcryptsetup の
+Python バインディングが収録されています。
 
 
 %prep
-%setup -q -n cryptsetup-%{version}
+%setup -q -n cryptsetup-%{upstream_version}
-%patch -p1
+chmod -x python/pycryptsetup-test.py
-%patch3 -p1
-#recode latin1..utf-8 ChangeLog
 
 
 %build
-%configure --sbindir=/sbin --libdir=/%{_lib}
+%configure  --sbindir=%{_root_sbindir} --libdir=/%{_lib} \
+	--enable-python \
+	--disable-selinux
+# remove rpath
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
-rm -rf  $RPM_BUILD_ROOT/%{_lib}/*.la $RPM_BUILD_ROOT/%{_lib}/cryptsetup
+rm -rf  %{buildroot}/%{_lib}/*.la %{buildroot}/%{_lib}/cryptsetup
 
-# move libcryptsetup.so to %{_libdir}
+# move libcryptsetup.so to %%{_libdir}
-pushd $RPM_BUILD_ROOT/%{_lib}
+pushd %{buildroot}/%{_lib}
 rm libcryptsetup.so
-mkdir -p $RPM_BUILD_ROOT/%{_libdir}
+mkdir -p %{buildroot}/%{_libdir}
-ln -s ../../%{_lib}/$(ls libcryptsetup.so.?.?.?) $RPM_BUILD_ROOT/%{_libdir}/libcryptsetup.so
+ln -s ../../%{_lib}/$(ls libcryptsetup.so.?.?.?) %{buildroot}/%{_libdir}/libcryptsetup.so
-popd 
+mv %{buildroot}/%{_lib}/pkgconfig %{buildroot}/%{_libdir}
+popd
 %find_lang cryptsetup
 
 
-%post -p /sbin/ldconfig
+%post -n cryptsetup-libs -p /sbin/ldconfig
 
 
-%postun -p /sbin/ldconfig
+%postun -n cryptsetup-libs -p /sbin/ldconfig
 
 
 %files -f cryptsetup.lang
-%defattr(-,root,root,-)
+%doc COPYING ChangeLog AUTHORS TODO FAQ
-%doc COPYING ChangeLog AUTHORS TODO
 %{_mandir}/man8/cryptsetup.8.gz
-/sbin/cryptsetup
+%{_root_sbindir}/cryptsetup
-/%{_lib}/libcryptsetup.so.*
 
 
 %files devel
-%defattr(-,root,root,-)
+%doc docs/examples/*
 %{_includedir}/libcryptsetup.h
 %{_libdir}/libcryptsetup.so
+%{_libdir}/pkgconfig/libcryptsetup.pc
+
+
+%files libs
+%doc COPYING
+/%{_lib}/libcryptsetup.so.*
+
+
+%files python
+%doc COPYING.LGPL python/pycryptsetup-test.py
+%exclude %{python_sitearch}/pycryptsetup.la
+%{python_sitearch}/pycryptsetup.so
+
+
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %changelog
-* Sun Sep 21 2008 Shu KONNO <owa@bg.wakwak.com> 1.0.5-8vl5
+* Fri Mar 23 2012 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 1.4.1-3
-- applied new versioning policy
+- updated to 1.4.1; spec revamp; Japanese summary & description
+
+  - Sun Sep 21 2008 Shu KONNO <owa@bg.wakwak.com> 1.0.5-8vl5
+  - applied new versioning policy
+  
+  - Sun Dec  9 2007 MATSUBAYASHI Kohji <shaolin@vinelinux.org> 1.0.5-7vl1
+  - initial build for VineSeed
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Wed Nov 09 2011 Milan Broz <mbroz@redhat.com> - 1.4.1-1
+- Update to cryptsetup 1.4.1.
+- Add Python cryptsetup bindings.
+- Obsolete separate python-cryptsetup package.
+
+* Wed Oct 26 2011 Milan Broz <mbroz@redhat.com> - 1.4.0-1
+- Update to cryptsetup 1.4.0.
+
+* Mon Oct 10 2011 Milan Broz <mbroz@redhat.com> - 1.4.0-0.1
+- Update to cryptsetup 1.4.0-rc1.
+- Rename package back from cryptsetup-luks to cryptsetup.
+
+* Wed Jun 22 2011 Milan Broz <mbroz@redhat.com> - 1.3.1-2
+- Fix return code for status command when device doesn't exist.
+
+* Tue May 24 2011 Milan Broz <mbroz@redhat.com> - 1.3.1-1
+- Update to cryptsetup 1.3.1.
+
+* Tue Apr 05 2011 Milan Broz <mbroz@redhat.com> - 1.3.0-1
+- Update to cryptsetup 1.3.0.
+
+* Tue Mar 22 2011 Milan Broz <mbroz@redhat.com> - 1.3.0-0.2
+- Update to cryptsetup 1.3.0-rc2
+
+* Mon Mar 14 2011 Milan Broz <mbroz@redhat.com> - 1.3.0-0.1
+- Update to cryptsetup 1.3.0-rc1
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Mon Dec 20 2010 Milan Broz <mbroz@redhat.com> - 1.2.0-1
+- Update to cryptsetup 1.2.0
+
+* Thu Nov 25 2010 Milan Broz <mbroz@redhat.com> - 1.2.0-0.2
+- Fix crypt_activate_by_keyfile() to work with PLAIN devices.
+
+* Tue Nov 16 2010 Milan Broz <mbroz@redhat.com> - 1.2.0-0.1
+- Add FAQ to documentation.
+- Update to cryptsetup 1.2.0-rc1
+
+* Sat Jul 03 2010 Milan Broz <mbroz@redhat.com> - 1.1.3-1
+- Update to cryptsetup 1.1.3
+
+* Mon Jun 07 2010 Milan Broz <mbroz@redhat.com> - 1.1.2-2
+- Fix alignment ioctl use.
+- Fix API activation calls to handle NULL device name.
+
+* Sun May 30 2010 Milan Broz <mbroz@redhat.com> - 1.1.2-1
+- Update to cryptsetup 1.1.2
+- Fix luksOpen handling of new line char on stdin.
+
+* Sun May 23 2010 Milan Broz <mbroz@redhat.com> - 1.1.1-1
+- Update to cryptsetup 1.1.1
+- Fix luksClose for stacked LUKS/LVM devices.
+
+* Mon May 03 2010 Milan Broz <mbroz@redhat.com> - 1.1.1-0.2
+- Update to cryptsetup 1.1.1-rc2.
+
+* Sat May 01 2010 Milan Broz <mbroz@redhat.com> - 1.1.1-0.1
+- Update to cryptsetup 1.1.1-rc1.
+
+* Sun Jan 17 2010 Milan Broz <mbroz@redhat.com> - 1.1.0-1
+- Update to cryptsetup 1.1.0.
+
+* Fri Jan 15 2010 Milan Broz <mbroz@redhat.com> - 1.1.0-0.6
+- Fix gcrypt initialisation.
+- Fix backward compatibility for hash algorithm (uppercase).
+
+* Wed Dec 30 2009 Milan Broz <mbroz@redhat.com> - 1.1.0-0.5
+- Update to cryptsetup 1.1.0-rc4
+
+* Mon Nov 16 2009 Milan Broz <mbroz@redhat.com> - 1.1.0-0.4
+- Update to cryptsetup 1.1.0-rc3
+
+* Thu Oct 01 2009 Milan Broz <mbroz@redhat.com> - 1.1.0-0.3
+- Update to cryptsetup 1.1.0-rc2
+- Fix libcryptsetup to properly export only versioned symbols.
+
+* Tue Sep 29 2009 Milan Broz <mbroz@redhat.com> - 1.1.0-0.2
+- Update to cryptsetup 1.1.0-rc1
+- Add luksHeaderBackup and luksHeaderRestore commands.
+
+* Thu Sep 11 2009 Milan Broz <mbroz@redhat.com> - 1.1.0-0.1
+- Update to new upstream testing version with new API interface.
+- Add luksSuspend and luksResume commands.
+- Introduce pkgconfig.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jul 22 2009 Milan Broz <mbroz@redhat.com> - 1.0.7-1
+- Update to upstream final release.
+- Split libs subpackage.
+- Remove rpath setting from cryptsetup binary.
+
+* Wed Jul 15 2009 Till Maas <opensource@till.name> - 1.0.7-0.2
+- update BR because of libuuid splitout from e2fsprogs
+
+* Mon Jun 22 2009 Milan Broz <mbroz@redhat.com> - 1.0.7-0.1
+- Update to new upstream 1.0.7-rc1.
+
+- Wipe old fs headers to not confuse blkid (#468062)
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.6-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Oct 30 2008 Milan Broz <mbroz@redhat.com> - 1.0.6-6
+- Wipe old fs headers to not confuse blkid (#468062)
+
+* Tue Sep 23 2008 Milan Broz <mbroz@redhat.com> - 1.0.6-5
+- Change new project home page.
+- Print more descriptive messages for initialization errors.
+- Refresh patches to versions commited upstream.
+
+* Sat Sep 06 2008 Milan Broz <mbroz@redhat.com> - 1.0.6-4
+- Fix close of zero decriptor.
+- Fix udevsettle delays - use temporary crypt device remapping.
+
+* Wed May 28 2008 Till Maas <opensource till name> - 1.0.6-3
+- remove a duplicate sentence from the manpage (RH #448705)
+- add patch metadata about upstream status
+
+* Tue Apr 15 2008 Bill Nottinghm <notting@redhat.com> - 1.0.6-2
+- Add the device to the luksOpen prompt (#433406)
+- Use iconv, not recode (#442574)
+
+* Thu Mar 13 2008 Till Maas <opensource till name> - 1.0.6-1
+- Update to latest version
+- remove patches that have been merged upstream
+
+* Mon Mar 03 2008 Till Maas <opensource till name> - 1.0.6-0.1.pre2
+- Update to new version with several bugfixes
+- remove patches that have been merged upstream
+- add patch from cryptsetup newsgroup
+- fix typo / missing luksRemoveKey in manpage (patch)
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.0.5-9
+- Autorebuild for GCC 4.3
 
-* Sun Dec  9 2007 MATSUBAYASHI Kohji <shaolin@vinelinux.org> 1.0.5-7vl1
+* Sat Jan 19 2008 Peter Jones <pjones@redhat.com> - 1.0.5-8
-- initial build for VineSeed
+- Rebuild for broken deps.
 
 * Thu Aug 30 2007 Till Maas <opensource till name> - 1.0.5-7
 - update URL

d/dialog/dialog-vl.spec

@@ -1,16 +1,22 @@
-Summary: A utility for creating TTY dialog boxes.
+Summary:	A utility for creating TTY dialog boxes.
-Summary(ja): TTY ダイアログボックスのユーティリティ
+Summary(ja):	TTY ダイアログボックスのユーティリティ
-Name: dialog
+Name:		dialog
-%define SubVersion 20060221
+%define		SubVersion 20110707
-Version: 1.0.%{SubVersion}
+Version:	1.1
-Release: 1%{?_dist_release}
+Release:	1.svn%{SubVersion}%{?_dist_release}
-License: GPL
+License:	LGPLv2
-Group: Applications/System
+Group:		Applications/System
-URL: http://invisible-island.net/dialog/dialog.html
+URL:		http://invisible-island.net/dialog/dialog.html
-Source: ftp://invisible-island.net/dialog/dialog-1.0-%{SubVersion}.tgz
+Source:		ftp://invisible-island.net/dialog/dialog-1.1-%{SubVersion}.tgz
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+Patch1:		dialog-incdir.patch
-Requires: ncurses
+Patch2:		dialog-multilib.patch
-BuildPreReq: ncurses-devel, gettext
+Patch3:		dialog-libs.patch
+BuildRoot:	%{_tmppath}/%{name}-%{version}-root
+BuildRequires:	ncurses-devel, gettext findutils libtool
+Requires:	ncurses
+
+Vendor:		Project Vine
+Distribution:	Vine Linux
 
 
 %description
@@ -24,45 +30,100 @@ Install dialog if you would like to create TTY dialog boxes.
 
 
 %description -l ja
-Dialog は TTY (テキストモード) インタフェース上に，質問やメッセージを
+Dialog は TTY (テキストモード) インタフェース上に、質問やメッセージを
-含むダイアログボックスを表示するユーティリティです．
+含むダイアログボックスを表示するユーティリティです。
-Dialog はシェルスクリプトから (あるいはその中から) 呼び出すことが出来ます．
+Dialog はシェルスクリプトから (あるいはその中から) 呼び出すことが出来ます。
-実装されているダイアログボックスには yes/no，メニュー，入力エリア，
+実装されているダイアログボックスには yes/no、メニュー、入力エリア、
-メッセージ，テキスト，情報，チェックリスト，ラジオボタン，ゲージ等が
+メッセージ、テキスト、情報、チェックリスト、ラジオボタン、ゲージ等が
-あります．
+あります。
 
-TTY ダイアログボックスを作成したければ dialog をインストールして下さい．
+TTY ダイアログボックスを作成したければ dialog をインストールして下さい。
 
 
-%prep
+%package devel 
-%setup -q -n dialog-1.0-%{SubVersion}
+Summary: Development files for building applications with the dialog library
+Summary(ja): Dialog ライブラリ用開発ファイル
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release} ncurses-devel
+
+%description devel
+Dialog is a utility that allows you to show dialog boxes (containing
+questions or messages) in TTY (text mode) interfaces. This package 
+contains the files needed for developing applications, which use the 
+dialog library.
+
+
+%description devel -l ja
+Dialog は TTY (テキストモード) インタフェース上に、質問やメッセージを
+含むダイアログボックスを表示するユーティリティです。
+このパッケージには Dialog ライブラリを使うアプリケーションの開発に
+必要なファイルが収録されています。
 
 
+%prep
+%setup -q -n dialog-%{version}-%{SubVersion}
+%patch1 -p1 -b .incdir
+%patch2 -p1 -b .multilib
+%patch3 -p1 -b .libs
+
 %build
-%configure --enable-nls
+%configure \
-make
+	--enable-nls \
+	--with-libtool \
+	--with-ncursesw \
+	--includedir=%{_includedir}/dialog
+make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
-fgrep -l -r perl samples|xargs rm -f
+
+# prepare packaged samples
+rm -rf _samples
+mkdir _samples
+cp -a samples _samples
+rm -rf _samples/samples/install
+find _samples -type f -print0 | xargs -0 chmod a-x
+
+make install DESTDIR=%{buildroot}
 
-%makeinstall
+chmod 755 %{buildroot}%{_libdir}/libdialog.so.*.*.*
+rm -f %{buildroot}%{_libdir}/libdialog.{,l}a
 
 %find_lang %name
 
+
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
+
+
+%post -p /sbin/ldconfig
+
+
+%postun -p /sbin/ldconfig
 
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc COPYING dialog.lsm README samples
+%doc COPYING dialog.lsm README _samples/samples
 %{_bindir}/dialog
+%{_libdir}/libdialog.so.*
 %{_mandir}/man1/dialog.*
 
 
+%files devel
+%defattr(-,root,root,-)
+%{_bindir}/dialog-config
+%{_includedir}/dialog
+%{_libdir}/libdialog.so
+%{_mandir}/man3/dialog.*
+
+
 %changelog
+* Fri Mar 23 2012 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 1.1-1.svn20110707
+- new upstream release
+- introduce -devel subpackage; sync with 1.1-15.20110707.fc17
+
 * Fri Aug 15 2008 Shu KONNO <owa@bg.wakwak.com> 1.0.20060221-1vl5
 - applied new versioning policy, spec in utf-8