[pkg-opensc-commit] [pkcs11-helper] 212/253: Fix rpm spec file

[Eric Dorland]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository pkcs11-helper.

commit 6986030f13ac18bdb70b6c33265bad0dc48d92d2
Author: Alon Bar-Lev <alon.barlev at gmail.com>
Date:   Fri Nov 11 21:52:56 2011 +0000

    Fix rpm spec file
---
 Makefile.am                      |  6 ------
 configure.ac                     |  2 +-
 distro/rpm/pkcs11-helper.spec.in | 25 ++++++++++++++-----------
 3 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 81551d6..e054598 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -68,9 +68,3 @@ SUBDIRS=man include lib m4dir doc distro tests
 
 dist_doc_DATA=README COPYING.GPL COPYING.BSD COPYING
 noinst_HEADERS=config-w32-vc.h
-
-#
-# pkcs11-helper.spec must be on root for invalid RPM
-#
-dist-hook:
-	$(LN_S) "distro/rpm/pkcs11-helper.spec" "$(distdir)/pkcs11-helper.spec"
diff --git a/configure.ac b/configure.ac
index 3115b41..2882fb4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,7 +54,7 @@ AC_PREREQ(2.60)
 define([PACKAGE_VERSION_MAJOR], [1])
 define([PACKAGE_VERSION_MINOR], [10])
 define([PACKAGE_VERSION_FIX], [0])
-define([PACKAGE_SUFFIX], [-svn])
+define([PACKAGE_SUFFIX], [_svn])
 
 AC_INIT([pkcs11-helper],[PACKAGE_VERSION_MAJOR.PACKAGE_VERSION_MINOR[]PACKAGE_SUFFIX])
 AC_CONFIG_AUX_DIR([.])
diff --git a/distro/rpm/pkcs11-helper.spec.in b/distro/rpm/pkcs11-helper.spec.in
index 0707fef..030fa17 100644
--- a/distro/rpm/pkcs11-helper.spec.in
+++ b/distro/rpm/pkcs11-helper.spec.in
@@ -1,27 +1,28 @@
+# doc support
+%bcond_with doc
+
 %define		name		@PACKAGE@
 %define		version		@VERSION@
 %define		release		2
 %define		prefix		/usr
-%define		with_doc	0
 
 Summary:	pkcs11-helper is a helper library for the use with smart cards and the PKCS#11 API
 Name:		%{name}
 Version:	%{version}
-Release:	%{release}%{dist}
+Release:	%{release}
 License:	GPL-2/BSD
 Vendor:		The OpenSC Project, http://www.opensc-project.org
-Packager:	Eddy Nigg <eddy_nigg at startcom.org>
+Packager:	Alon Bar-Lev <alon.barlev at gmail.com>
 Group:		System/Crypto
 Url:		http://www.opensc-project.org/pkcs11-helper
 Source:		http://www.opensc-project.org/files/pkcs11-helper/%{name}-%{version}.tar.bz2
 BuildRoot:	/var/tmp/%{name}-%{version}-%{release}
-%if %{?with_doc}
+%if %{with doc}
 BuildRequires:	doxygen
 %endif
 BuildRequires:	openssl-devel >= 0.9.7a
 Requires:	openssl >= 0.9.7a
 Provides:	%{name} = %{version}
-
 %description
 pkcs11-helper allows using multiple PKCS#11 providers at the same 
 time, selecting keys by id, label or certificate subject, handling 
@@ -34,29 +35,28 @@ Summary:	pkcs11-helper development files
 Group:		Development/Libraries
 Requires:	%{name} >= %{version}
 Requires:	pkgconfig
-
 %description devel
 pkcs11-helper development files.
 
 %prep
+rm -rf "${RPM_BUILD_ROOT}"
 %setup -q
 
 %build
 %configure -q \
 	--disable-rpath \
-%if %{?with_doc}
+%if %{with doc}
 	--enable-doc
 %endif
 
 make %{?_smp_mflags}
 
 %install
-if [ -d $RPM_BUILD_ROOT ]; then rm -rf $RPM_BUILD_ROOT; fi
-
+rm -rf "${RPM_BUILD_ROOT}"
 %makeinstall 
 
 %clean
-if [ -d $RPM_BUILD_ROOT ]; then rm -rf $RPM_BUILD_ROOT; fi
+rm -rf "${RPM_BUILD_ROOT}"
 
 %files
 %defattr(-,root,root)
@@ -70,11 +70,14 @@ if [ -d $RPM_BUILD_ROOT ]; then rm -rf $RPM_BUILD_ROOT; fi
 %{_includedir}/*
 %{_libdir}/pkgconfig/*
 %{_datadir}/aclocal/*
-%if %{?with_doc}
+%if %{with doc}
 %{_docdir}/%{name}/api/*
 %endif
 
 %changelog
+* Fri Nov 11 2011 Aon Bar-Lev <alon.barlev at gmail.com>
+- Cleanups.
+
 * Mon Feb 15 2007 Aon Bar-Lev <alon.barlev at gmail.com>
 - Modify docs location.
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opensc/pkcs11-helper.git