diff --git a/xrootd-include.patch b/xrootd-include.patch new file mode 100644 index 0000000..6baadf2 --- /dev/null +++ b/xrootd-include.patch @@ -0,0 +1,15 @@ +diff -ur xrootd-3.2.2.orig/src/XrdOss/XrdOssAio.cc xrootd-3.2.2/src/XrdOss/XrdOssAio.cc +--- xrootd-3.2.2.orig/src/XrdOss/XrdOssAio.cc 2012-06-18 14:39:12.000000000 +0200 ++++ xrootd-3.2.2/src/XrdOss/XrdOssAio.cc 2012-07-11 20:41:40.792903194 +0200 +@@ -15,10 +15,8 @@ + #include + #include + #include +-#ifdef _POSIX_ASYNCHRONOUS_IO +-#ifdef __FreeBSD__ + #include +-#endif ++#ifdef _POSIX_ASYNCHRONOUS_IO + #ifdef __macos__ + #include + #else diff --git a/xrootd.spec b/xrootd.spec index 3a00cbe..58ffd96 100644 --- a/xrootd.spec +++ b/xrootd.spec @@ -4,8 +4,8 @@ Name: xrootd Epoch: 1 -Version: 3.2.1 -Release: 2%{?dist} +Version: 3.2.2 +Release: 1%{?dist} Summary: Extended ROOT file server Group: System Environment/Daemons @@ -17,6 +17,7 @@ Patch0: %{name}-perl.patch Patch1: %{name}-java.patch Patch2: %{name}-cryptoload.patch Patch3: %{name}-init.patch +Patch4: %{name}-include.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake @@ -41,6 +42,7 @@ BuildRequires: graphviz-gd %endif Provides: %{name}-server = %{epoch}:%{version}-%{release} +Provides: %{name}-server%{?_isa} = %{epoch}:%{version}-%{release} Obsoletes: %{name}-server < %{epoch}:%{version}-%{release} Requires: %{name}-libs = %{epoch}:%{version}-%{release} @@ -76,6 +78,10 @@ clients. Summary: Development files for xrootd Group: Development/Libraries Requires: %{name}-libs = %{epoch}:%{version}-%{release} +Provides: %{name}-client-devel = %{epoch}:%{version}-%{release} +Provides: %{name}-client-devel%{?_isa} = %{epoch}:%{version}-%{release} +Provides: %{name}-server-devel = %{epoch}:%{version}-%{release} +Provides: %{name}-server-devel%{?_isa} = %{epoch}:%{version}-%{release} %description devel This package contains header files and development libraries for xrootd. @@ -135,6 +141,7 @@ This package contains the API documentation of the xrootd libraries. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 # Use absolute path to load JNI library sed 's!loadLibrary("\(.*\)")!load("%{_libdir}/%{name}/lib\1.so")!' \ @@ -361,6 +368,9 @@ fi %doc %{_docdir}/%{name}-%{version} %changelog +* Wed Jul 11 2012 Mattias Ellert - 1:3.2.2-1 +- Update to version 3.2.2 + * Mon Jun 11 2012 Petr Pisar - 1:3.2.1-2 - Perl 5.16 rebuild