projects
/
shibboleth
/
cpp-sp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5201655
)
https://issues.shibboleth.net/jira/browse/SSPCPP-544
author
Scott Cantor
<cantor.2@osu.edu>
Wed, 27 Aug 2014 15:17:43 +0000
(15:17 +0000)
committer
Scott Cantor
<cantor.2@osu.edu>
Wed, 27 Aug 2014 15:17:43 +0000
(15:17 +0000)
shibboleth.spec.in
patch
|
blob
|
history
diff --git
a/shibboleth.spec.in
b/shibboleth.spec.in
index
26c3b20
..
2390356
100644
(file)
--- a/
shibboleth.spec.in
+++ b/
shibboleth.spec.in
@@
-17,9
+17,13
@@
PreReq: xmltooling-schemas >= 1.5.0, opensaml-schemas >= 2.5.0
%endif
%if 0%{?suse_version} > 1030 && 0%{?suse_version} < 1130
PreReq: %{insserv_prereq} %{fillup_prereq}
%endif
%if 0%{?suse_version} > 1030 && 0%{?suse_version} < 1130
PreReq: %{insserv_prereq} %{fillup_prereq}
-BuildRequires: libXerces-c-devel >= 2.8.0
+BuildRequires:
libXerces-c-devel >= 2.8.0
%else
%else
-BuildRequires: libxerces-c-devel >= 2.8.0
+%if 0%{?rhel} >= 7 || 0%{?centos_version} >= 700
+BuildRequires: xerces-c-devel >= 2.8.0
+%else
+BuildRequires: libxerces-c-devel >= 2.8.0
+%endif
%endif
BuildRequires: libxml-security-c-devel >= 1.4.0
BuildRequires: libxmltooling-devel >= 1.5.0
%endif
BuildRequires: libxml-security-c-devel >= 1.4.0
BuildRequires: libxmltooling-devel >= 1.5.0
@@
-76,9
+80,13
@@
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}-%{release}
Obsoletes: shibboleth-sp-devel = 2.5.0
%if 0%{?suse_version} > 1030 && 0%{?suse_version} < 1130
Requires: %{name} = %{version}-%{release}
Obsoletes: shibboleth-sp-devel = 2.5.0
%if 0%{?suse_version} > 1030 && 0%{?suse_version} < 1130
-Requires: libXerces-c-devel >= 2.8.0
+Requires: libXerces-c-devel >= 2.8.0
+%else
+%if 0%{?rhel} >= 7 || 0%{?centos_version} >= 700
+Requires: xerces-c-devel >= 2.8.0
%else
%else
-Requires: libxerces-c-devel >= 2.8.0
+Requires: libxerces-c-devel >= 2.8.0
+%endif
%endif
Requires: libxml-security-c-devel >= 1.4.0
Requires: libxmltooling-devel >= 1.5.0
%endif
Requires: libxml-security-c-devel >= 1.4.0
Requires: libxmltooling-devel >= 1.5.0
@@
-336,6
+344,10
@@
fi
%doc %{pkgdocdir}/api
%changelog
%doc %{pkgdocdir}/api
%changelog
+* Tue May 13 2014 Ian Young <ian@iay.org.uk> - 2.5.3-1.2
+- Update package dependencies for RHEL/CentOS 7
+- Fix bogus dates in changelog
+
* Sat Jun 8 2013 Scott Cantor <cantor.2@osu.edu> - 2.5.2-1
- Add --with-gssapi using MIT K5 by default
* Sat Jun 8 2013 Scott Cantor <cantor.2@osu.edu> - 2.5.2-1
- Add --with-gssapi using MIT K5 by default
@@
-422,10
+434,10
@@
fi
- Applied fix for secadv 20061002
- Fix for metadata loader loop
- Applied fix for secadv 20061002
- Fix for metadata loader loop
-*
Wed
Jun 15 2006 Scott Cantor <cantor.2@osu.edu> - 1.3-10
+*
Thu
Jun 15 2006 Scott Cantor <cantor.2@osu.edu> - 1.3-10
- Applied fix for sec 20060615
- Applied fix for sec 20060615
-*
Fri
Apr 15 2006 Scott Cantor <cantor.2@osu.edu> - 1.3-9
+*
Sat
Apr 15 2006 Scott Cantor <cantor.2@osu.edu> - 1.3-9
- Misc. patches, SuSE, Apache 2.2, gcc 4.1, and 64-bit support
* Mon Jan 9 2006 Scott Cantor <cantor.2@osu.edu> - 1.3-8
- Misc. patches, SuSE, Apache 2.2, gcc 4.1, and 64-bit support
* Mon Jan 9 2006 Scott Cantor <cantor.2@osu.edu> - 1.3-8