[rpms/pam_url] epel10: Merge branch 'master' of ssh://pkgs.fedoraproject.org/pam_url

[Konstantin Ryabitsev <mricon@kernel.org>]

            A new commit has been pushed.

            Repo   : rpms/pam_url
            Branch : epel10
            Commit : 7a89227d31569029643023b7fe1b32b5f0a79713
            Author : Konstantin Ryabitsev <mricon@kernel.org>
            Date   : 2013-11-18T17:20:38-05:00
            Stats  : +21/-6 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/pam_url/c/7a89227d31569029643023b7fe1b32b5f0a79713?branch=epel10

            Log:
            Merge branch 'master' of ssh://pkgs.fedoraproject.org/pam_url

Conflicts:
	pam_url.spec

---
diff --git a/pam_url.spec b/pam_url.spec
index b5b8e14..ffa492e 100644
--- a/pam_url.spec
+++ b/pam_url.spec
@@ -18,10 +18,10 @@ such as totpcgi.
 %setup -q
 
 %build
-CFLAGS="%{optflags} -std=c99" make %{?_smp_mflags} all
+CFLAGS="%{optflags} -std=c99" make %{?_smp_mflags} pamlib=%{_lib}/security all
 
 %install
-make DESTDIR=%{buildroot} install
+make DESTDIR=%{buildroot} pamlib=%{_lib}/security install
 
 %files
 %defattr(-,root,root,-)
@@ -31,9 +31,19 @@ make DESTDIR=%{buildroot} install
 
 
 %changelog
-* Mon Nov 18 2013 Konstantin Ryabitsev <icon@fedoraproject.org> - 0.3.3-1
+<<<<<<< HEAD
+* Mon Nov 18 2013 Konstantin Ryabitsev <icon@fedoraproject.org> - 1:0.3.3-1
 - Upstream 0.3.3 with minor new features.
 
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.3.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.3.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Thu Dec 06 2012 Dan Horák <dan[at]danny.cz> - 0.3.2-2
+- fix build on all 64-bit arches
+
 * Tue Dec 04 2012 Konstantin Ryabitsev <icon@fedoraproject.org> - 0.3.2-1
 - Upstream 0.3.2 with fixes for correct pam stacking.
 

diff --git a/.gitignore b/.gitignore
index 39c91be..3cc1586 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /pam_url-0.3.tar.bz2
 /pam_url-0.3.1.tar.bz2
 /pam_url-0.3.2.tar.bz2
+/pam_url-0.3.3.tar.bz2

diff --git a/pam_url.spec b/pam_url.spec
index 5b0ece1..ffa492e 100644
--- a/pam_url.spec
+++ b/pam_url.spec
@@ -1,7 +1,7 @@
 Summary:        PAM module to authenticate with HTTP servers
 Name:           pam_url
-Version:        0.3.2
-Release:        4%{?dist}
+Version:        0.3.3
+Release:        1%{?dist}
 Epoch:          1
 License:        GPLv2
 Group:          System Environment/Base
@@ -31,6 +31,10 @@ make DESTDIR=%{buildroot} pamlib=%{_lib}/security install
 
 
 %changelog
+<<<<<<< HEAD
+* Mon Nov 18 2013 Konstantin Ryabitsev <icon@fedoraproject.org> - 1:0.3.3-1
+- Upstream 0.3.3 with minor new features.
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.3.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 

diff --git a/sources b/sources
index c7de43f..5ecdc2c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-24d97342d021f027d04562b459a59db1  pam_url-0.3.2.tar.bz2
+0fe6d16b4df479335082a11095194947  pam_url-0.3.3.tar.bz2