Architecture specific change in rpms/glusterfs.git
by githook-noreply@fedoraproject.org
The package rpms/glusterfs.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/glusterfs.git/commit/?id=7d3834b7....
Change:
+%ifarch s390 s390x %{arm}
Thanks.
Full change:
============
commit 7d3834b71ce9ea03a9c06e5fbaa2b9369cefb1ba
Author: Adam Williamson <awilliam(a)redhat.com>
Date: Wed Aug 23 12:04:52 2017 -0700
Use %{arm} macro rather than just armv7hl
diff --git a/glusterfs.spec b/glusterfs.spec
index dd61e4b..ce21841 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -26,7 +26,7 @@
%{?_without_rdma:%global _without_rdma --disable-ibverbs}
# No RDMA Support on s390(x)
-%ifarch s390 s390x armv7hl
+%ifarch s390 s390x %{arm}
%global _without_rdma --disable-ibverbs
%endif
6 years, 10 months
Architecture specific change in rpms/glusterfs.git
by githook-noreply@fedoraproject.org
The package rpms/glusterfs.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/glusterfs.git/commit/?id=7d3834b7....
Change:
+%ifarch s390 s390x %{arm}
Thanks.
Full change:
============
commit 7d3834b71ce9ea03a9c06e5fbaa2b9369cefb1ba
Author: Adam Williamson <awilliam(a)redhat.com>
Date: Wed Aug 23 12:04:52 2017 -0700
Use %{arm} macro rather than just armv7hl
diff --git a/glusterfs.spec b/glusterfs.spec
index dd61e4b..ce21841 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -26,7 +26,7 @@
%{?_without_rdma:%global _without_rdma --disable-ibverbs}
# No RDMA Support on s390(x)
-%ifarch s390 s390x armv7hl
+%ifarch s390 s390x %{arm}
%global _without_rdma --disable-ibverbs
%endif
6 years, 10 months
Architecture specific change in rpms/glusterfs.git
by githook-noreply@fedoraproject.org
The package rpms/glusterfs.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/glusterfs.git/commit/?id=0c05a6df....
Change:
+%ifarch s390 s390x armv7hl
Thanks.
Full change:
============
commit e8d4f085027bf3fe71b712947e5ddf7c4f1b156f
Merge: 03fdb92 0c05a6d
Author: Adam Williamson <awilliam(a)redhat.com>
Date: Wed Aug 23 12:02:29 2017 -0700
Merge branch 'master' into f27
commit 0c05a6df7d4bda9d75ca43f811d0b3406cb4bd67
Author: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
Date: Tue Aug 22 09:06:50 2017 -0400
3.11.3 libibverbs-devel, librdmacm-devel -> rdma-core-devel
diff --git a/glusterfs.spec b/glusterfs.spec
index ef82d30..dd61e4b 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -26,7 +26,7 @@
%{?_without_rdma:%global _without_rdma --disable-ibverbs}
# No RDMA Support on s390(x)
-%ifarch s390 s390x
+%ifarch s390 s390x armv7hl
%global _without_rdma --disable-ibverbs
%endif
@@ -183,7 +183,7 @@ Summary: Distributed File System
%if ( 0%{_for_fedora_koji_builds} )
Name: glusterfs
Version: 3.11.3
-Release: 1%{?prereltag:.%{prereltag}}%{?dist}
+Release: 2%{?prereltag:.%{prereltag}}%{?dist}
%else
Name: @PACKAGE_NAME@
Version: @PACKAGE_VERSION@
@@ -545,8 +545,12 @@ Obsoletes: python-gluster < 3.10
%package rdma
Summary: GlusterFS rdma support for ib-verbs
Group: Applications/File
+%if ( 0%{?fedora} && 0%{?fedora} > 26 )
+BuildRequires: rdma-core-devel
+%else
BuildRequires: libibverbs-devel
BuildRequires: librdmacm-devel >= 1.0.15
+%endif
Requires: %{name} = %{version}-%{release}
%description rdma
@@ -1390,6 +1394,9 @@ exit 0
%endif
%changelog
+* Tue Aug 22 2017 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.11.3-2
+- 3.11.3 libibverbs-devel, librdmacm-devel -> rdma-core-devel
+
* Mon Aug 21 2017 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.11.3-1
- 3.11.3 GA
commit 69821efcd606e72b8c07aa293730de199a4c283c
Author: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
Date: Mon Aug 21 11:00:54 2017 -0400
3.11.3 GA
diff --git a/glusterfs.spec b/glusterfs.spec
index a15c948..ef82d30 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -111,6 +111,9 @@
%if ( 0%{?rhel} && 0%{?rhel} < 7 )
%{!?python2_sitelib: %global python2_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
%{!?python2_sitearch: %global python2_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
+%global _rundir %{_localstatedir}/run
+%else
+%global _rundir /run
%endif
%if ( 0%{?_with_systemd:1} )
@@ -179,12 +182,12 @@
Summary: Distributed File System
%if ( 0%{_for_fedora_koji_builds} )
Name: glusterfs
-Version: 3.11.2
-Release: 3%{?prereltag:.%{prereltag}}%{?dist}
+Version: 3.11.3
+Release: 1%{?prereltag:.%{prereltag}}%{?dist}
%else
Name: @PACKAGE_NAME@
Version: @PACKAGE_VERSION@
-Release: 0.@PACKAGE_RELEASE(a)%{?dist}.6
+Release: 0.@PACKAGE_RELEASE(a)%{?dist}.5
%endif
License: GPLv2 or LGPLv3+
Group: System Environment/Base
@@ -228,7 +231,7 @@ BuildRequires: ncurses-devel readline-devel
BuildRequires: libxml2-devel openssl-devel
BuildRequires: libaio-devel libacl-devel
BuildRequires: python2-devel
-%if ( 0%{?rhel} )
+%if ( 0%{?rhel} && 0%{?rhel} <= 7 )
BuildRequires: python-ctypes
%endif
BuildRequires: userspace-rcu-devel >= 0.7
@@ -404,7 +407,7 @@ Group: Applications/File
# site-packages area
Requires: python2-gluster = %{version}-%{release}
Requires: python2
-%if ( 0%{?rhel} )
+%if ( 0%{?rhel} && 0%{?rhel} <= 7 )
BuildRequires: python-ctypes
%endif
@@ -453,7 +456,7 @@ Requires: %{name} = %{version}-%{release}
Requires: %{name}-server = %{version}-%{release}
Requires: python2
Requires: python-prettytable
-%if ( 0%{?rhel} )
+%if ( 0%{?rhel} && 0%{?rhel} <= 7 )
BuildRequires: python-ctypes
%endif
Requires: python2-gluster = %{version}-%{release}
@@ -731,7 +734,7 @@ install -D -p -m 0755 %{SOURCE6} \
mkdir -p %{buildroot}%{_localstatedir}/log/glusterd
mkdir -p %{buildroot}%{_localstatedir}/log/glusterfs
mkdir -p %{buildroot}%{_localstatedir}/log/glusterfsd
-mkdir -p %{buildroot}%{_localstatedir}/run/gluster
+mkdir -p %{buildroot}%{_rundir}/gluster
# Remove unwanted files from all the shared libraries
find %{buildroot}%{_libdir} -name '*.a' -delete
@@ -915,7 +918,7 @@ if [ $? -eq 0 ]; then
#Cleaning leftover glusterd socket file which is created by glusterd in
#rpm_script_t context.
- rm -rf /var/run/glusterd.socket
+ rm -f %{_rundir}/glusterd.socket
# glusterd _was_ running, we killed it, it exited after *.upgrade=on,
# so start it again
@@ -925,7 +928,7 @@ else
#Cleaning leftover glusterd socket file which is created by glusterd in
#rpm_script_t context.
- rm -rf /var/run/glusterd.socket
+ rm -f %{_rundir}/glusterd.socket
fi
exit 0
@@ -934,7 +937,7 @@ exit 0
##
%pre
getent group gluster > /dev/null || groupadd -r gluster
-getent passwd gluster > /dev/null || useradd -r -g gluster -d /var/run/gluster -s /sbin/nologin -c "GlusterFS daemons" gluster
+getent passwd gluster > /dev/null || useradd -r -g gluster -d %{_rundir}/gluster -s /sbin/nologin -c "GlusterFS daemons" gluster
exit 0
##-----------------------------------------------------------------------------
@@ -1057,7 +1060,7 @@ exit 0
%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/nl-cache.so
%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/system
%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/system/posix-acl.so
-%dir %attr(0775,gluster,gluster) %{_localstatedir}/run/gluster
+%dir %attr(0775,gluster,gluster) %{_rundir}/gluster
%if 0%{?_tmpfilesdir:1}
%{_tmpfilesdir}/gluster.conf
%endif
@@ -1343,7 +1346,7 @@ exit 0
%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/stop/pre
%attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/stop/pre/S30samba-stop.sh
%attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/stop/pre/S29CTDB-teardown.sh
-%ghost %attr(0600,-,-) %{_sharedstatedir}/glusterd/options
+%config(noreplace) %ghost %attr(0600,-,-) %{_sharedstatedir}/glusterd/options
%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/peers
%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/quotad
%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/scrub
@@ -1387,6 +1390,9 @@ exit 0
%endif
%changelog
+* Mon Aug 21 2017 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.11.3-1
+- 3.11.3 GA
+
* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.11.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
diff --git a/sources b/sources
index 85cbf9e..ad79895 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (glusterfs-3.11.2.tar.gz) = 98dec5d50f17adcb37a928172b84711b4214cab869141c777eb78415fe997924c9d6ba5fe871e94d2dc4eabf23f8a125643fa4c16af1565553e15092b5c26c88
+SHA512 (glusterfs-3.11.3.tar.gz) = a4ef8717873283fce6bc21ef5c6950e92706b473c1148e7d3e82bf57b348d70bcb3c8e6744aa3aed3a4f036869383d99cd29c21bd7b67b478a958ea374165eb6
6 years, 10 months
Architecture specific change in rpms/glusterfs.git
by githook-noreply@fedoraproject.org
The package rpms/glusterfs.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/glusterfs.git/commit/?id=03fdb92c....
Change:
+%ifarch s390 s390x armv7hl
Thanks.
Full change:
============
commit e8d4f085027bf3fe71b712947e5ddf7c4f1b156f
Merge: 03fdb92 0c05a6d
Author: Adam Williamson <awilliam(a)redhat.com>
Date: Wed Aug 23 12:02:29 2017 -0700
Merge branch 'master' into f27
commit 03fdb92c9c7e9c2d71fd4a1f199c4b169b5c95de
Author: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
Date: Tue Aug 22 08:36:06 2017 -0400
3.11.3 libibverbs-devel, librdmacm-devel -> rdma-core-devel
diff --git a/glusterfs.spec b/glusterfs.spec
index ef82d30..dd61e4b 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -26,7 +26,7 @@
%{?_without_rdma:%global _without_rdma --disable-ibverbs}
# No RDMA Support on s390(x)
-%ifarch s390 s390x
+%ifarch s390 s390x armv7hl
%global _without_rdma --disable-ibverbs
%endif
@@ -183,7 +183,7 @@ Summary: Distributed File System
%if ( 0%{_for_fedora_koji_builds} )
Name: glusterfs
Version: 3.11.3
-Release: 1%{?prereltag:.%{prereltag}}%{?dist}
+Release: 2%{?prereltag:.%{prereltag}}%{?dist}
%else
Name: @PACKAGE_NAME@
Version: @PACKAGE_VERSION@
@@ -545,8 +545,12 @@ Obsoletes: python-gluster < 3.10
%package rdma
Summary: GlusterFS rdma support for ib-verbs
Group: Applications/File
+%if ( 0%{?fedora} && 0%{?fedora} > 26 )
+BuildRequires: rdma-core-devel
+%else
BuildRequires: libibverbs-devel
BuildRequires: librdmacm-devel >= 1.0.15
+%endif
Requires: %{name} = %{version}-%{release}
%description rdma
@@ -1390,6 +1394,9 @@ exit 0
%endif
%changelog
+* Tue Aug 22 2017 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.11.3-2
+- 3.11.3 libibverbs-devel, librdmacm-devel -> rdma-core-devel
+
* Mon Aug 21 2017 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.11.3-1
- 3.11.3 GA
commit 81a5d672fc5107a48b81cae3dc5d5b65f491169a
Author: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
Date: Mon Aug 21 11:31:27 2017 -0400
3.11.3 GA
diff --git a/glusterfs.spec b/glusterfs.spec
index a15c948..ef82d30 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -111,6 +111,9 @@
%if ( 0%{?rhel} && 0%{?rhel} < 7 )
%{!?python2_sitelib: %global python2_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
%{!?python2_sitearch: %global python2_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
+%global _rundir %{_localstatedir}/run
+%else
+%global _rundir /run
%endif
%if ( 0%{?_with_systemd:1} )
@@ -179,12 +182,12 @@
Summary: Distributed File System
%if ( 0%{_for_fedora_koji_builds} )
Name: glusterfs
-Version: 3.11.2
-Release: 3%{?prereltag:.%{prereltag}}%{?dist}
+Version: 3.11.3
+Release: 1%{?prereltag:.%{prereltag}}%{?dist}
%else
Name: @PACKAGE_NAME@
Version: @PACKAGE_VERSION@
-Release: 0.@PACKAGE_RELEASE(a)%{?dist}.6
+Release: 0.@PACKAGE_RELEASE(a)%{?dist}.5
%endif
License: GPLv2 or LGPLv3+
Group: System Environment/Base
@@ -228,7 +231,7 @@ BuildRequires: ncurses-devel readline-devel
BuildRequires: libxml2-devel openssl-devel
BuildRequires: libaio-devel libacl-devel
BuildRequires: python2-devel
-%if ( 0%{?rhel} )
+%if ( 0%{?rhel} && 0%{?rhel} <= 7 )
BuildRequires: python-ctypes
%endif
BuildRequires: userspace-rcu-devel >= 0.7
@@ -404,7 +407,7 @@ Group: Applications/File
# site-packages area
Requires: python2-gluster = %{version}-%{release}
Requires: python2
-%if ( 0%{?rhel} )
+%if ( 0%{?rhel} && 0%{?rhel} <= 7 )
BuildRequires: python-ctypes
%endif
@@ -453,7 +456,7 @@ Requires: %{name} = %{version}-%{release}
Requires: %{name}-server = %{version}-%{release}
Requires: python2
Requires: python-prettytable
-%if ( 0%{?rhel} )
+%if ( 0%{?rhel} && 0%{?rhel} <= 7 )
BuildRequires: python-ctypes
%endif
Requires: python2-gluster = %{version}-%{release}
@@ -731,7 +734,7 @@ install -D -p -m 0755 %{SOURCE6} \
mkdir -p %{buildroot}%{_localstatedir}/log/glusterd
mkdir -p %{buildroot}%{_localstatedir}/log/glusterfs
mkdir -p %{buildroot}%{_localstatedir}/log/glusterfsd
-mkdir -p %{buildroot}%{_localstatedir}/run/gluster
+mkdir -p %{buildroot}%{_rundir}/gluster
# Remove unwanted files from all the shared libraries
find %{buildroot}%{_libdir} -name '*.a' -delete
@@ -915,7 +918,7 @@ if [ $? -eq 0 ]; then
#Cleaning leftover glusterd socket file which is created by glusterd in
#rpm_script_t context.
- rm -rf /var/run/glusterd.socket
+ rm -f %{_rundir}/glusterd.socket
# glusterd _was_ running, we killed it, it exited after *.upgrade=on,
# so start it again
@@ -925,7 +928,7 @@ else
#Cleaning leftover glusterd socket file which is created by glusterd in
#rpm_script_t context.
- rm -rf /var/run/glusterd.socket
+ rm -f %{_rundir}/glusterd.socket
fi
exit 0
@@ -934,7 +937,7 @@ exit 0
##
%pre
getent group gluster > /dev/null || groupadd -r gluster
-getent passwd gluster > /dev/null || useradd -r -g gluster -d /var/run/gluster -s /sbin/nologin -c "GlusterFS daemons" gluster
+getent passwd gluster > /dev/null || useradd -r -g gluster -d %{_rundir}/gluster -s /sbin/nologin -c "GlusterFS daemons" gluster
exit 0
##-----------------------------------------------------------------------------
@@ -1057,7 +1060,7 @@ exit 0
%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/nl-cache.so
%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/system
%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/system/posix-acl.so
-%dir %attr(0775,gluster,gluster) %{_localstatedir}/run/gluster
+%dir %attr(0775,gluster,gluster) %{_rundir}/gluster
%if 0%{?_tmpfilesdir:1}
%{_tmpfilesdir}/gluster.conf
%endif
@@ -1343,7 +1346,7 @@ exit 0
%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/stop/pre
%attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/stop/pre/S30samba-stop.sh
%attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/stop/pre/S29CTDB-teardown.sh
-%ghost %attr(0600,-,-) %{_sharedstatedir}/glusterd/options
+%config(noreplace) %ghost %attr(0600,-,-) %{_sharedstatedir}/glusterd/options
%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/peers
%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/quotad
%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/scrub
@@ -1387,6 +1390,9 @@ exit 0
%endif
%changelog
+* Mon Aug 21 2017 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.11.3-1
+- 3.11.3 GA
+
* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.11.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
diff --git a/sources b/sources
index 85cbf9e..ad79895 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (glusterfs-3.11.2.tar.gz) = 98dec5d50f17adcb37a928172b84711b4214cab869141c777eb78415fe997924c9d6ba5fe871e94d2dc4eabf23f8a125643fa4c16af1565553e15092b5c26c88
+SHA512 (glusterfs-3.11.3.tar.gz) = a4ef8717873283fce6bc21ef5c6950e92706b473c1148e7d3e82bf57b348d70bcb3c8e6744aa3aed3a4f036869383d99cd29c21bd7b67b478a958ea374165eb6
6 years, 10 months
Architecture specific change in rpms/chromium.git
by githook-noreply@fedoraproject.org
The package rpms/chromium.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/chromium.git/commit/?id=b413a7441....
Change:
+%ifarch aarch64
Thanks.
Full change:
============
commit b413a74418255ded1c8f4c6b45002d03372b0179
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Wed Aug 23 14:53:36 2017 -0400
Another player has entered the game: aarch64!
diff --git a/chromium-60.0.3112.101-fix-ffmpeg-aarch64.patch b/chromium-60.0.3112.101-fix-ffmpeg-aarch64.patch
new file mode 100644
index 0000000..a39e044
--- /dev/null
+++ b/chromium-60.0.3112.101-fix-ffmpeg-aarch64.patch
@@ -0,0 +1,12 @@
+diff -up chromium-60.0.3112.101/third_party/ffmpeg/ffmpeg_generated.gni.aarch64 chromium-60.0.3112.101/third_party/ffmpeg/ffmpeg_generated.gni
+--- chromium-60.0.3112.101/third_party/ffmpeg/ffmpeg_generated.gni.aarch64 2017-08-23 14:46:37.305832399 -0400
++++ chromium-60.0.3112.101/third_party/ffmpeg/ffmpeg_generated.gni 2017-08-23 14:47:06.217148864 -0400
+@@ -539,7 +539,7 @@ if (is_linux && current_cpu == "arm64")
+ ]
+ }
+
+-if ((is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS")) {
++if ((is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chromium")) {
+ ffmpeg_c_sources += [
+ "libavcodec/aarch64/mpegaudiodsp_init.c",
+ ]
diff --git a/chromium.spec b/chromium.spec
index 2c2e466..b058c6d 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -202,6 +202,8 @@ Patch46: chromium-60.0.3112.90-init-list-hack.patch
Patch47: chromium-60.0.3112.90-vulkan-force-c99.patch
# https://chromium.googlesource.com/chromium/src/+/9c77470ff34bac937ceb765a...
Patch48: chromium-60.0.3112.101-camfix.patch
+# Fix mp3 for aarch64
+Patch49: chromium-60.0.3112.101-fix-ffmpeg-aarch64.patch
### Chromium Tests Patches ###
Patch100: chromium-46.0.2490.86-use_system_opus.patch
@@ -411,7 +413,7 @@ Provides: chromium-libs = %{version}-%{release}
Obsoletes: chromium-libs <= %{version}-%{release}
%endif
-ExclusiveArch: x86_64 i686
+ExclusiveArch: x86_64 i686 aarch64
# Bundled bits (I'm sure I've missed some)
Provides: bundled(angle) = 2422
@@ -623,6 +625,7 @@ udev.
# Do not apply mp3 change
%else
%patch34 -p1 -b .mp3
+%patch49 -p1 -b .aarch64
%endif
%patch36 -p1 -b .revert
%patch37 -p1 -b .ffmpeg-stdatomic
@@ -751,7 +754,7 @@ popd
# Core defines are flags that are true for both the browser and headless.
CHROMIUM_CORE_GN_DEFINES=""
CHROMIUM_CORE_GN_DEFINES+=' is_debug=false'
-%ifarch x86_64
+%ifarch x86_64 aarch64
CHROMIUM_CORE_GN_DEFINES+=' system_libdir="lib64"'
%endif
CHROMIUM_CORE_GN_DEFINES+=' google_api_key="%{api_key}" google_default_client_id="%{default_client_id}" google_default_client_secret="%{default_client_secret}"'
@@ -762,6 +765,9 @@ CHROMIUM_CORE_GN_DEFINES+=' ffmpeg_branding="ChromeOS" proprietary_codecs=true'
CHROMIUM_CORE_GN_DEFINES+=' ffmpeg_branding="Chromium" proprietary_codecs=false'
%endif
CHROMIUM_CORE_GN_DEFINES+=' treat_warnings_as_errors=false'
+%ifarch aarch64
+CHROMIUM_CORE_GN_DEFINES+=' target_cpu="arm64"'
+%endif
export CHROMIUM_CORE_GN_DEFINES
CHROMIUM_BROWSER_GN_DEFINES=""
@@ -1005,6 +1011,18 @@ build/linux/unbundle/replace_gn_files.py --system-libraries \
yasm \
zlib
+# fix arm gcc
+sed -i 's|arm-linux-gnueabihf-|arm-linux-gnu-|g' build/toolchain/linux/BUILD.gn
+
+%ifarch aarch64
+# We don't need to cross compile while building on an aarch64 system.
+sed -i 's|aarch64-linux-gnu-||g' build/toolchain/linux/BUILD.gn
+
+# Correct the ninja file to check for aarch64, not just x86.
+sed -i '/${LONG_BIT}/ a \ aarch64)\' ../depot_tools/ninja
+sed -i '/aarch64)/ a \ exec "/usr/bin/ninja-build" "$@";;\' ../depot_tools/ninja
+%endif
+
tools/gn/bootstrap/bootstrap.py -v --gn-gen-args "$CHROMIUM_CORE_GN_DEFINES $CHROMIUM_BROWSER_GN_DEFINES"
%{target}/gn gen --args="$CHROMIUM_CORE_GN_DEFINES $CHROMIUM_BROWSER_GN_DEFINES" %{target}
@@ -1030,9 +1048,6 @@ sed '14i#define WIDEVINE_CDM_VERSION_STRING "Something fresh"' -i "third_party/w
FILE=chrome/common/channel_info_posix.cc
sed -i.orig -e 's/getenv("CHROME_VERSION_EXTRA")/"Fedora Project"/' $FILE
-# fix arm gcc
-sed -i 's|arm-linux-gnueabihf-|arm-linux-gnu-|g' build/toolchain/linux/BUILD.gn
-
%build
%if %{?tests}
@@ -1845,6 +1860,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%changelog
+* Wed Aug 23 2017 Tom Callaway <spot(a)fedoraproject.org> 60.0.3112.101-3
+- apply aarch64 fixes from Ryan Blakely <rblakely(a)redhat.com>
+
* Thu Aug 17 2017 Tom Callaway <spot(a)fedoraproject.org> 60.0.3112.101-2
- fix dep issue with chrome-remote-desktop on el7
6 years, 10 months
Architecture specific change in rpms/corosync.git
by githook-noreply@fedoraproject.org
The package rpms/corosync.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/corosync.git/commit/?id=6752825d5....
Change:
+%ifnarch s390 s390x %{arm}
Thanks.
Full change:
============
commit 6752825d5fec0ef9db1536d7ed4e2525db89e8b0
Author: Adam Williamson <awilliam(a)redhat.com>
Date: Wed Aug 23 11:48:07 2017 -0700
Disable RDMA on 32-bit ARM (#1484155)
diff --git a/corosync.spec b/corosync.spec
index aa09770..e281afb 100644
--- a/corosync.spec
+++ b/corosync.spec
@@ -6,8 +6,8 @@
%bcond_with monitoring
%bcond_without snmp
%bcond_without dbus
-# no InfiniBand stack on s390(x)
-%ifnarch s390 s390x
+# no InfiniBand stack on s390(x) and 32-bit ARM
+%ifnarch s390 s390x %{arm}
%bcond_without rdma
%endif
%bcond_without systemd
@@ -23,7 +23,7 @@
Name: corosync
Summary: The Corosync Cluster Engine and Application Programming Interfaces
Version: 2.4.2
-Release: 4%{?gitver}%{?dist}
+Release: 5%{?gitver}%{?dist}
License: BSD
Group: System Environment/Base
URL: http://corosync.github.io/corosync/
@@ -510,6 +510,9 @@ fi
%endif
%changelog
+* Wed Aug 23 2017 Adam Williamson <awilliam(a)redhat.com> - 2.4.2-5
+- Disable RDMA on 32-bit ARM (#1484155)
+
* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.4.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
6 years, 10 months
Architecture specific change in rpms/corosync.git
by githook-noreply@fedoraproject.org
The package rpms/corosync.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/corosync.git/commit/?id=6752825d5....
Change:
+%ifnarch s390 s390x %{arm}
Thanks.
Full change:
============
commit 6752825d5fec0ef9db1536d7ed4e2525db89e8b0
Author: Adam Williamson <awilliam(a)redhat.com>
Date: Wed Aug 23 11:48:07 2017 -0700
Disable RDMA on 32-bit ARM (#1484155)
diff --git a/corosync.spec b/corosync.spec
index aa09770..e281afb 100644
--- a/corosync.spec
+++ b/corosync.spec
@@ -6,8 +6,8 @@
%bcond_with monitoring
%bcond_without snmp
%bcond_without dbus
-# no InfiniBand stack on s390(x)
-%ifnarch s390 s390x
+# no InfiniBand stack on s390(x) and 32-bit ARM
+%ifnarch s390 s390x %{arm}
%bcond_without rdma
%endif
%bcond_without systemd
@@ -23,7 +23,7 @@
Name: corosync
Summary: The Corosync Cluster Engine and Application Programming Interfaces
Version: 2.4.2
-Release: 4%{?gitver}%{?dist}
+Release: 5%{?gitver}%{?dist}
License: BSD
Group: System Environment/Base
URL: http://corosync.github.io/corosync/
@@ -510,6 +510,9 @@ fi
%endif
%changelog
+* Wed Aug 23 2017 Adam Williamson <awilliam(a)redhat.com> - 2.4.2-5
+- Disable RDMA on 32-bit ARM (#1484155)
+
* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.4.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
6 years, 10 months
Architecture specific change in rpms/nss.git
by githook-noreply@fedoraproject.org
The package rpms/nss.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/nss.git/commit/?id=61169569b13845....
Change:
-%ifarch %{multilib_arches}
Thanks.
Full change:
============
commit 61169569b13845986b3aeed3cfc3a3012a4427f3
Author: Kai Engert <kaie(a)redhat.com>
Date: Wed Aug 23 19:41:28 2017 +0200
NSS libnssckbi.so has already been obsoleted by p11-kit-trust, rhbz#1484449
diff --git a/nss.spec b/nss.spec
index f8dd825..d3676be 100644
--- a/nss.spec
+++ b/nss.spec
@@ -4,24 +4,12 @@
%global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
%global allTools "certutil cmsutil crlutil derdump modutil pk12util signtool signver ssltap vfychain vfyserv"
-# solution taken from icedtea-web.spec
-%define multilib_arches %{power64} sparc64 x86_64 mips64 mips64el
-%ifarch %{multilib_arches}
-%define alt_ckbi libnssckbi.so.%{_arch}
-%else
-%define alt_ckbi libnssckbi.so
-%endif
-
-# Define if using a source archive like "nss-version.with.ckbi.version".
-# To "disable", add "#" to start of line, AND a space after "%".
-#% define nss_ckbi_suffix .with.ckbi.1.93
-
Summary: Network Security Services
Name: nss
Version: 3.32.0
# for Rawhide, please always use release >= 2
# for Fedora release branches, please use release < 2 (1.0, 1.1, ...)
-Release: 2%{?dist}
+Release: 3%{?dist}
License: MPLv2.0
URL: http://www.mozilla.org/projects/security/pki/nss/
Group: System Environment/Libraries
@@ -30,8 +18,7 @@ Requires: nss-util >= %{nss_util_version}
# TODO: revert to same version as nss once we are done with the merge
Requires: nss-softokn%{_isa} >= %{nss_softokn_version}
Requires: nss-system-init
-Requires(post): %{_sbindir}/update-alternatives
-Requires(postun): %{_sbindir}/update-alternatives
+Requires: p11-kit-trust
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: nspr-devel >= %{nspr_version}
# TODO: revert to same version as nss once we are done with the merge
@@ -64,13 +51,7 @@ Conflicts: seamonkey < 2.46-2
# https://bugzilla.redhat.com/show_bug.cgi?id=1414987
# Conflicts: icecat < 45.5.1-5
-%if %{defined nss_ckbi_suffix}
-%define full_nss_version %{version}%{nss_ckbi_suffix}
-%else
-%define full_nss_version %{version}
-%endif
-
-Source0: %{name}-%{full_nss_version}.tar.gz
+Source0: %{name}-%{version}.tar.gz
Source1: nss.pc.in
Source2: nss-config.in
Source3: blank-cert8.db
@@ -526,9 +507,6 @@ echo "test suite completed"
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man5
-touch $RPM_BUILD_ROOT%{_libdir}/libnssckbi.so
-%{__install} -p -m 755 dist/*.OBJ/lib/libnssckbi.so $RPM_BUILD_ROOT/%{_libdir}/nss/libnssckbi.so
-
# Copy the binary libraries we want
for file in libnss3.so libnsssysinit.so libsmime3.so libssl3.so
do
@@ -617,33 +595,9 @@ done
/usr/bin/setup-nsssysinit.sh on
%post
-# If we upgrade, and the shared filename is a regular file, then we must
-# remove it, before we can install the alternatives symbolic link.
-if [ $1 -gt 1 ] ; then
- # when upgrading or downgrading
- if ! test -L %{_libdir}/libnssckbi.so; then
- rm -f %{_libdir}/libnssckbi.so
- fi
-fi
-# Install the symbolic link
-# FYI: Certain other packages use alternatives --set to enforce that the first
-# installed package is preferred. We don't do that. Highest priority wins.
-%{_sbindir}/update-alternatives --install %{_libdir}/libnssckbi.so \
- %{alt_ckbi} %{_libdir}/nss/libnssckbi.so 10
/sbin/ldconfig
%postun
-if [ $1 -eq 0 ] ; then
- # package removal
- %{_sbindir}/update-alternatives --remove %{alt_ckbi} %{_libdir}/nss/libnssckbi.so
-else
- # upgrade or downgrade
- # If the new installed package uses a regular file (not a symblic link),
- # then cleanup the alternatives link.
- if ! test -L %{_libdir}/libnssckbi.so; then
- %{_sbindir}/update-alternatives --remove %{alt_ckbi} %{_libdir}/nss/libnssckbi.so
- fi
-fi
/sbin/ldconfig
@@ -654,8 +608,6 @@ fi
%{_libdir}/libnss3.so
%{_libdir}/libssl3.so
%{_libdir}/libsmime3.so
-%ghost %{_libdir}/libnssckbi.so
-%{_libdir}/nss/libnssckbi.so
%dir %{_sysconfdir}/pki/nssdb
%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/pki/nssdb/cert8.db
%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/pki/nssdb/key3.db
@@ -795,6 +747,9 @@ fi
%changelog
+* Wed Aug 23 2017 Kai Engert <kaie(a)redhat.com> - 3.32.0-3
+- NSS libnssckbi.so has already been obsoleted by p11-kit-trust, rhbz#1484449
+
* Mon Aug 7 2017 Daiki Ueno <dueno(a)redhat.com> - 3.32.0-2
- Update to NSS 3.32.0
6 years, 10 months
Architecture specific change in rpms/ceph.git
by githook-noreply@fedoraproject.org
The package rpms/ceph.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/ceph.git/commit/?id=30b06a8179612...
https://src.fedoraproject.org/cgit/rpms/ceph.git/commit/?id=c19045b38337e...
https://src.fedoraproject.org/cgit/rpms/ceph.git/commit/?id=bcc0c8937ec14....
Change:
+%ifnarch ppc64le
+%ifnarch %{arm}
+%ifnarch %{arm}
Thanks.
Full change:
============
commit 76c62774fd127f6ca34f9d555c066815e2ea4f42
Merge: bcc0c89 c19045b
Author: Adam Williamson <awilliam(a)redhat.com>
Date: Wed Aug 23 09:06:04 2017 -0700
Merge branch 'master' into f27
commit bcc0c8937ec1421709ec9654846f94bb61e791b0
Author: Adam Williamson <awilliam(a)redhat.com>
Date: Wed Aug 23 09:00:09 2017 -0700
Disable RDMA support on 32-bit ARM (#1484155)
diff --git a/ceph.spec b/ceph.spec
index c709589..eb63771 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -86,7 +86,7 @@
#################################################################################
Name: ceph
Version: 12.1.4
-Release: 2%{?dist}
+Release: 3%{?dist}
%if 0%{?fedora} || 0%{?rhel}
Epoch: 1
%endif
@@ -206,7 +206,10 @@ BuildRequires: boost-random
BuildRequires: btrfs-progs
BuildRequires: nss-devel
BuildRequires: keyutils-libs-devel
+# RDMA is no longer built on 32-bit ARM: see #1484155
+%ifnarch %{arm}
BuildRequires: libibverbs-devel
+%endif
BuildRequires: openldap-devel
BuildRequires: openssl-devel
BuildRequires: redhat-lsb-core
@@ -883,6 +886,10 @@ cmake .. \
%else
-DWITH_RADOSGW_BEAST_FRONTEND=OFF \
%endif
+# RDMA is no longer built on 32-bit ARM: see #1484155
+%ifnarch %{arm}
+ -DWITH_RDMA=OFF \
+%endif
-DBOOST_J=%{_smp_ncpus}
make %{?_smp_mflags}
@@ -1792,6 +1799,9 @@ exit 0
%changelog
+* Tue Aug 22 2017 Adam Williamson <awilliam(a)redhat.com> - 1:12.1.4-3
+- Disable RDMA support on 32-bit ARM (#1484155)
+
* Thu Aug 17 2017 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 1:12.1.4-2
- fix %%epoch in comment, ppc64le lowmem_builder
commit c19045b38337e013691798c4c5f19d3bf1a57e5f
Author: Adam Williamson <awilliam(a)redhat.com>
Date: Wed Aug 23 09:00:09 2017 -0700
Disable RDMA support on 32-bit ARM (#1484155)
diff --git a/ceph.spec b/ceph.spec
index c709589..eb63771 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -86,7 +86,7 @@
#################################################################################
Name: ceph
Version: 12.1.4
-Release: 2%{?dist}
+Release: 3%{?dist}
%if 0%{?fedora} || 0%{?rhel}
Epoch: 1
%endif
@@ -206,7 +206,10 @@ BuildRequires: boost-random
BuildRequires: btrfs-progs
BuildRequires: nss-devel
BuildRequires: keyutils-libs-devel
+# RDMA is no longer built on 32-bit ARM: see #1484155
+%ifnarch %{arm}
BuildRequires: libibverbs-devel
+%endif
BuildRequires: openldap-devel
BuildRequires: openssl-devel
BuildRequires: redhat-lsb-core
@@ -883,6 +886,10 @@ cmake .. \
%else
-DWITH_RADOSGW_BEAST_FRONTEND=OFF \
%endif
+# RDMA is no longer built on 32-bit ARM: see #1484155
+%ifnarch %{arm}
+ -DWITH_RDMA=OFF \
+%endif
-DBOOST_J=%{_smp_ncpus}
make %{?_smp_mflags}
@@ -1792,6 +1799,9 @@ exit 0
%changelog
+* Tue Aug 22 2017 Adam Williamson <awilliam(a)redhat.com> - 1:12.1.4-3
+- Disable RDMA support on 32-bit ARM (#1484155)
+
* Thu Aug 17 2017 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 1:12.1.4-2
- fix %%epoch in comment, ppc64le lowmem_builder
commit 30b06a817961249da626d69fb0deb58a53772d23
Author: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
Date: Fri Aug 18 09:25:01 2017 -0400
fix %epoch in comment, ppc64le lowmem_builder
diff --git a/ceph.spec b/ceph.spec
index 3307dc0..c709589 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -36,8 +36,16 @@
%ifnarch armv7hl
%bcond_with lowmem_builder
%else
+%if 0%{?rhel}
+%ifnarch ppc64le
+%bcond_with lowmem_builder
+%else
+%bcond_without lowmem_builder
+%endif
+%else
%bcond_without lowmem_builder
%endif
+%endif
%if 0%{?fedora} || 0%{?rhel}
%bcond_without selinux
%endif
@@ -77,13 +85,13 @@
# main package definition
#################################################################################
Name: ceph
-Version: 12.1.3
-Release: 1%{?dist}
+Version: 12.1.4
+Release: 2%{?dist}
%if 0%{?fedora} || 0%{?rhel}
Epoch: 1
%endif
-# define %_epoch_prefix macro which will expand to the empty string if %epoch is undefined
+# define %%_epoch_prefix macro which will expand to the empty string if %%epoch is undefined
%global _epoch_prefix %{?epoch:%{epoch}:}
Summary: User space components of the Ceph file system
@@ -1784,6 +1792,12 @@ exit 0
%changelog
+* Thu Aug 17 2017 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 1:12.1.4-2
+- fix %%epoch in comment, ppc64le lowmem_builder
+
+* Wed Aug 16 2017 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 1:12.1.4-1
+- New release (1:12.1.4-1)
+
* Sat Aug 12 2017 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 1:12.1.3-1
- New release (1:12.1.3-1)
diff --git a/sources b/sources
index 9b75234..cc5abc3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ceph-12.1.3.tar.gz) = 989bda3ad64df23fc7a3efd1db1922f17de0fca837f0d37f5e953433519070c609fcbd74a3c862ae06f6a862527aa3ece7c7d1a8c8d62649800087287508e423
+SHA512 (ceph-12.1.4.tar.gz) = be4d11ec3aa47ccc7c31e81dec7db913e68d344e3594baefb87ddc4ca58b3eba00f42a8b34454e6ef8145bed790280788487278bedf67b65616f4e387f09d170
6 years, 10 months
Architecture specific change in rpms/ceph.git
by githook-noreply@fedoraproject.org
The package rpms/ceph.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/ceph.git/commit/?id=02830d2e489bc...
https://src.fedoraproject.org/cgit/rpms/ceph.git/commit/?id=bcc0c8937ec14....
Change:
+%ifnarch ppc64le
+%ifnarch %{arm}
Thanks.
Full change:
============
commit 76c62774fd127f6ca34f9d555c066815e2ea4f42
Merge: bcc0c89 c19045b
Author: Adam Williamson <awilliam(a)redhat.com>
Date: Wed Aug 23 09:06:04 2017 -0700
Merge branch 'master' into f27
commit bcc0c8937ec1421709ec9654846f94bb61e791b0
Author: Adam Williamson <awilliam(a)redhat.com>
Date: Wed Aug 23 09:00:09 2017 -0700
Disable RDMA support on 32-bit ARM (#1484155)
diff --git a/ceph.spec b/ceph.spec
index c709589..eb63771 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -86,7 +86,7 @@
#################################################################################
Name: ceph
Version: 12.1.4
-Release: 2%{?dist}
+Release: 3%{?dist}
%if 0%{?fedora} || 0%{?rhel}
Epoch: 1
%endif
@@ -206,7 +206,10 @@ BuildRequires: boost-random
BuildRequires: btrfs-progs
BuildRequires: nss-devel
BuildRequires: keyutils-libs-devel
+# RDMA is no longer built on 32-bit ARM: see #1484155
+%ifnarch %{arm}
BuildRequires: libibverbs-devel
+%endif
BuildRequires: openldap-devel
BuildRequires: openssl-devel
BuildRequires: redhat-lsb-core
@@ -883,6 +886,10 @@ cmake .. \
%else
-DWITH_RADOSGW_BEAST_FRONTEND=OFF \
%endif
+# RDMA is no longer built on 32-bit ARM: see #1484155
+%ifnarch %{arm}
+ -DWITH_RDMA=OFF \
+%endif
-DBOOST_J=%{_smp_ncpus}
make %{?_smp_mflags}
@@ -1792,6 +1799,9 @@ exit 0
%changelog
+* Tue Aug 22 2017 Adam Williamson <awilliam(a)redhat.com> - 1:12.1.4-3
+- Disable RDMA support on 32-bit ARM (#1484155)
+
* Thu Aug 17 2017 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 1:12.1.4-2
- fix %%epoch in comment, ppc64le lowmem_builder
commit 02830d2e489bc542ad096f3c26ce096e1b96e6b0
Author: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
Date: Thu Aug 17 06:44:51 2017 -0400
fix %epoch in comment, ppc64le lowmem_builder
diff --git a/ceph.spec b/ceph.spec
index 8a68e9d..c709589 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -36,8 +36,16 @@
%ifnarch armv7hl
%bcond_with lowmem_builder
%else
+%if 0%{?rhel}
+%ifnarch ppc64le
+%bcond_with lowmem_builder
+%else
%bcond_without lowmem_builder
%endif
+%else
+%bcond_without lowmem_builder
+%endif
+%endif
%if 0%{?fedora} || 0%{?rhel}
%bcond_without selinux
%endif
@@ -78,12 +86,12 @@
#################################################################################
Name: ceph
Version: 12.1.4
-Release: 1%{?dist}
+Release: 2%{?dist}
%if 0%{?fedora} || 0%{?rhel}
Epoch: 1
%endif
-# define %_epoch_prefix macro which will expand to the empty string if %epoch is undefined
+# define %%_epoch_prefix macro which will expand to the empty string if %%epoch is undefined
%global _epoch_prefix %{?epoch:%{epoch}:}
Summary: User space components of the Ceph file system
@@ -1784,6 +1792,9 @@ exit 0
%changelog
+* Thu Aug 17 2017 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 1:12.1.4-2
+- fix %%epoch in comment, ppc64le lowmem_builder
+
* Wed Aug 16 2017 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 1:12.1.4-1
- New release (1:12.1.4-1)
commit 597c68f78d7a6176bb7f72fd4cb5ff151b164cc0
Author: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
Date: Wed Aug 16 09:26:22 2017 -0400
New release (1:12.1.4-1)
diff --git a/ceph.spec b/ceph.spec
index 3307dc0..8a68e9d 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -77,7 +77,7 @@
# main package definition
#################################################################################
Name: ceph
-Version: 12.1.3
+Version: 12.1.4
Release: 1%{?dist}
%if 0%{?fedora} || 0%{?rhel}
Epoch: 1
@@ -1784,6 +1784,9 @@ exit 0
%changelog
+* Wed Aug 16 2017 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 1:12.1.4-1
+- New release (1:12.1.4-1)
+
* Sat Aug 12 2017 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 1:12.1.3-1
- New release (1:12.1.3-1)
diff --git a/sources b/sources
index 9b75234..cc5abc3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ceph-12.1.3.tar.gz) = 989bda3ad64df23fc7a3efd1db1922f17de0fca837f0d37f5e953433519070c609fcbd74a3c862ae06f6a862527aa3ece7c7d1a8c8d62649800087287508e423
+SHA512 (ceph-12.1.4.tar.gz) = be4d11ec3aa47ccc7c31e81dec7db913e68d344e3594baefb87ddc4ca58b3eba00f42a8b34454e6ef8145bed790280788487278bedf67b65616f4e387f09d170
6 years, 10 months