Changeset 225 in pkcs11-helper

Timestamp:

11/11/11 21:52:56 (6 months ago)

Author:

alonbl

Message:

Fix rpm spec file

Location:

trunk

Files:

• Makefile.am (modified) (1 diff)
• configure.ac (modified) (1 diff)
• distro/rpm/pkcs11-helper.spec.in (modified) (6 diffs)

trunk/Makefile.am

@@ -69 +69 @@
 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"

trunk/configure.ac

@@ -55 +55 @@
 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])

trunk/distro/rpm/pkcs11-helper.spec.in

@@ +1 @@
+# 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@startcom.org>
+Packager:       Alon Bar-Lev <alon.barlev@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
@@ -22 +24 @@
 Requires:       openssl >= 0.9.7a
 Provides:       %{name} = %{version}
-
 %description
 pkcs11-helper allows using multiple PKCS#11 providers at the same 
@@ -35 +36 @@
 Requires:       %{name} >= %{version}
 Requires:       pkgconfig
-
 %description devel
 pkcs11-helper development files.
 
 %prep
+rm -rf "${RPM_BUILD_ROOT}"
 %setup -q
 
@@ -45 +46 @@
 %configure -q \
         --disable-rpath \
-%if %{?with_doc}
+%if %{with doc}
         --enable-doc
 %endif
@@ -52 +53 @@
 
 %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
@@ -71 +71 @@
 %{_libdir}/pkgconfig/*
 %{_datadir}/aclocal/*
-%if %{?with_doc}
+%if %{with doc}
 %{_docdir}/%{name}/api/*
 %endif
 
 %changelog
+* Fri Nov 11 2011 Aon Bar-Lev <alon.barlev@gmail.com>
+- Cleanups.
+
 * Mon Feb 15 2007 Aon Bar-Lev <alon.barlev@gmail.com>
 - Modify docs location.