[eurephia/f13/master] Rebased against upstream v1.0.1

dsommers dsommers at fedoraproject.org
Fri Sep 3 14:22:30 UTC 2010


commit 9a1a142c86989ad2be8310512bdee5cfb1381d96
Author: David Sommerseth <dazo at users.sourceforge.net>
Date:   Fri Sep 3 16:22:07 2010 +0200

    Rebased against upstream v1.0.1

 .gitignore    |    1 +
 eurephia.spec |   19 ++++++-------------
 sources       |    2 +-
 3 files changed, 8 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..7600dcb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/eurephia-1.0.1.tar.bz2
diff --git a/eurephia.spec b/eurephia.spec
index d39532c..816c9ba 100644
--- a/eurephia.spec
+++ b/eurephia.spec
@@ -1,6 +1,6 @@
 Name:           eurephia
-Version:        1.0.0
-Release:        10%{?betatag:.%{betatag}}%{?dist}
+Version:        1.0.1
+Release:        1%{?betatag:.%{betatag}}%{?dist}
 Summary:        An advanced and flexible OpenVPN user authentication plug-in
 
 Group:          Applications/Internet
@@ -8,9 +8,6 @@ License:        GPLv2
 URL:            http://www.eurephia.net/
 Source0:        http://downloads.sourceforge.net/project/eurephia/eurephia/v1.0/%{name}-%{version}%{?betatag:_%{betatag}}.tar.bz2
 Source1:        http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn/openvpn-plugin.h
-Patch0:         eurephia-1.0.0_buildfix.patch
-# git show 9f6d447f38c6cb1d0ea690..050585311ac7e6f17a > eurephia-1.0.0_misc_fixes.patch
-Patch1:         eurephia-1.0.0_misc_fixes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}{?betatag:_%{betatag}}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxml2-devel libxslt-devel openssl-devel
@@ -81,8 +78,6 @@ hash salt.
 
 %prep 
 %setup -q -n %{name}-%{version}%{?betatag:_%{betatag}}
-%patch0 -p1
-%patch1 -p1
 
 # This is needed to ship extra until openvpn-plugin.h becomes part of the OpenVPN RPM
 cp -v %{SOURCE1} .
@@ -90,6 +85,8 @@ cp -v %{SOURCE1} .
 %build
 # The configure script is not an autotools script, but a cmake wrapper script.
 CFLAGS="%{optflags}" ./configure --prefix %{_prefix} --bin-dir %{_bindir} --xslt-path %{_datadir}/eurephia/xslt --plug-in-dir %{_libdir}/eurephia --plug-in --openvpn-src . --fw-iptables --db-sqlite3 --sqlite3-path %{_localstatedir}/lib/eurephia --eurephiadm
+
+# We don't do parallel building, as that might fail.
 make VERBOSE=1
 
 %install
@@ -149,11 +146,8 @@ rm -rf %{buildroot}
 %{_mandir}/man7/eurephia_saltdecode.7.gz
 
 %changelog
-* Fri Jul 16 2010 David Sommerseth <davids at redhat.com> - 1.0.0-10
-- Bumped Release to 10 to get around F-13 cvs tag complaints
-
-* Fri Jul 16 2010 David Sommerseth <davids at redhat.com> - 1.0.0-9
-- Bumped Release to 9 to get around F-13 cvs tag complaints
+* Sun Aug 29 2010 David Somerseth <dazo at users.sourceforge.net> - 1.0.1-1
+- Rebased to eurephia v1.0.1
 
 * Thu Jul 15 2010 David Sommerseth <davids at redhat.com> - 1.0.0-8
 - Fixed silly mistakes
@@ -180,7 +174,6 @@ rm -rf %{buildroot}
   - Removed -b0 from setup macro
 
 * Thu Jul  8 2010 David Sommerseth <davids at redhat.com> - 1.0.0-3
-- Added patch to fix building in Koji/Fedora
 - Added missing Group tags
 - Added stricter cmake version requirement
 
diff --git a/sources b/sources
index b5deed6..a4c0d31 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-395040dd170e156a8f0e6d3150e0ea1e  eurephia-1.0.0.tar.bz2
+b4c329cbac5fd38dc8f4f3f13c36bf11  eurephia-1.0.1.tar.bz2


More information about the scm-commits mailing list