Hello community, here is the log from the commit of package ceph for openSUSE:Factory checked in at 2017-03-13 15:31:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ceph (Old) and /work/SRC/openSUSE:Factory/.ceph.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ceph" Mon Mar 13 15:31:02 2017 rev:8 rq:478533 version:12.0.0+git.1489159457.410e200 Changes: -------- --- /work/SRC/openSUSE:Factory/ceph/ceph-test.changes 2016-08-31 00:11:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ceph.new/ceph-test.changes 2017-03-13 15:31:07.190319228 +0100 @@ -1,0 +2,382 @@ +Fri Mar 10 15:55:53 UTC 2017 - [email protected] + +- Update to version 12.0.0+git.1489159457.410e200: + + build/ops: fix Group strings for library packages + +------------------------------------------------------------------- +Fri Mar 3 15:32:06 UTC 2017 - [email protected] + +- Update to version 12.0.0+git.1488553020.e902441: + + Recent upstream master (3c0af07629dc661aba84e2fef696339ac7171914) + + Builds with GCC7 (boo#1025891) + +------------------------------------------------------------------- +Wed Feb 08 21:28:28 UTC 2017 - [email protected] + +- Update to version 11.1.0+git.1486588482.ba197ae: + + Update to latest upstream master (3d740bd) + + cmake: added empty RPATH to several executables + + rocksdb: sync with upstream + +------------------------------------------------------------------- +Fri Jan 20 14:00:36 UTC 2017 - [email protected] + +- Update to version 11.1.0+git.1484919552.9216e9a: + + Revert "rpm: put distro conditionals around Source0 in spec file" + + Revert "ceph.spec.in: revert Source0 line to upstream version" + +------------------------------------------------------------------- +Fri Jan 20 10:18:44 UTC 2017 - [email protected] + +- pre_checkin.sh: add logic to remove s390 architectures from ExclusiveArch + line in ceph-test.spec (rationale: ceph-test is not shipped for s390x) + +------------------------------------------------------------------- +Fri Jan 20 10:06:54 UTC 2017 - [email protected] + +- Update to version 11.1.0+git.1484745543.7b08de5: + + Update to latest upstream master (36874c8) - significant changes: + * cmake: Turn libcommon into a shared library (PR#12840) + * cmake: fix rpath on shared libraries and executables (PR#12927) + + Fix build failure in ppc64le and s390x, caused by missing + "-momit-leaf-frame-pointer" gcc option in these architectures: + + rocksdb: build with ppc64 (PR#12908) + +------------------------------------------------------------------- +Tue Jan 17 14:14:45 UTC 2017 - [email protected] + +- Update to version 11.1.0+git.1484659687.3472421: + + rpm: tell openSUSE to never clean the spec file + + Enable ppc64le and s390x builds in SLE + + rpm: lttng only on x86_64 and aarch64 + +------------------------------------------------------------------- +Thu Jan 05 10:43:34 UTC 2017 - [email protected] + +- Update to version 11.1.0+git.1483528076.d86680e (latest master) + + Merge branch 'master' into ses5 (Merge: 185bcce798 a7b78620f0) with conflicts: + conflicts in qa/ where resolved with theirs + conflict in src/osd/PrimaryLogPG.cc was resolved with picking ours plus a method rename + int ReplicatedPG::do_extent_cmp -> int PrimaryLogPG::do_extent_cmp + +------------------------------------------------------------------- +Tue Dec 13 21:21:41 UTC 2016 - [email protected] + +- Update to version 11.1.0+git.1481663255.bf42706: + + Update to upstream 11.1.0 release; for details see + http://docs.ceph.com/docs/master/release-notes/#v11-1-0-release-candidate + + move ceph_ver_hack.sh script from build service package to git repo + (bsc#1015419) + +------------------------------------------------------------------- +Tue Nov 29 20:39:16 UTC 2016 - [email protected] + +- Update to version 11.0.2+git.1480437645.66595d3 + + Update to latest upstream master (boost library is now included in the + tarball, so the tarball is much larger than before and the build takes + longer to complete) + + ceph_ver_hack_sh adaptation (upstream dropped src/make_version script) + + rocksdb: do not build with --march=native (bsc#1012553) + +------------------------------------------------------------------- +Fri Nov 25 20:42:45 UTC 2016 - [email protected] + +- Update to version 11.0.2+git.1480105120.6b8e9e5: + + Revert commit 8aee8db140bcbd1ffd2a7b571dbbade10bec9de3 because it + conflicted with upstream + + update to latest upstream kraken (11.0.2) - for details, see + http://ceph.com/releases/kraken-11-0-2-released/ + +------------------------------------------------------------------- +Mon Sep 12 12:48:33 UTC 2016 - [email protected] + +- Update to version 11.0.0+git.1473684054.73e4b4a: + + safe_io: Improve portability by replacing loff_t type usage with off_t. + + mon: remove the redundant list swap in paxos commit_proposal + + msg/EventPoll.h: add override to virtual functions + + msg/EventKqueue.h: add override to virtual func + + msg/EventSelect.h: add override to virtual funct + + ceph-disk: Compatibility fixes for Python 3 + + ceph-disk: Use true integer division in get_dev_size + + ceph-disk: Fix bug in FileLock + + ceph-disk: Allow ConfigObj to write in binary mode + + ceph-disk: Use context manager with FileLock + + ceph-disk: Use os.path.isabs instead of .startswith('/') + + ceph-disk: Set space_symlink to the path, not file object + + ceph-disk: PEP8ify + + rgw: rgw file fix bug of rgw_lookup can not exact match file name + + rgw: fix the wrong return value + + rgw/rgw_coroutine: move WaitContext to .cc file + + client: pass a mask parameter to path_walk + + mds/mdstypes: add btime to inode + + mds/Server: set btime=ctime on creation + + mds/MDCache: set btime on system inodes + + include/ceph_features: add FS_BTIME features + + mds: pass btime in InodeStat MClientReply, if feature is present + + client: keep btime in Inode and InodeStat + + ceph: break up ll_getattr into two functions + + client: move the device bitshift handling macros to Client.h + + libcephfs: add a ceph_ll_getattrx and ceph_statx + + libcephfs: add a test for "lazy" statx + + mds/client: add btime to CapSnap and MClientCaps + + mds/mdstypes: add change attribute to inode + + mds/Server: set change_attr to 0 on creation + + mds/MDCache: set change_attr to 0 on system_inodes + + include/ceph_features: add FS_CHANGE_ATTR feature + + mds: pass change_attr in InodeStat MClientReply, if feature is present + + mds/client: keep change_attr in Inode, CapSnap and MClientCaps + + mds: ensure that change_attr reflects metadata changes on clients that hold CAP_FILE_EXCL + + mds/client: bump the change_attr at the appropriate time for files + + libcephfs: return the change_attr in the statx.stx_version field + + tests: add a ChangeAttr test + + mds: make frag_info_t add_dirty() function take a pointer to touched_mtime + + mds: add change_attr to frag_info_t + + test: add test for change attribute of directories + + cephfs: rename ceph_mds_request_head and _args with a _legacy postfix + + MDS: allow the MDS to accept requests to set the btime + + client: add the ability to set the btime + + client: add a ceph_fstatx + + client: extend the Btime test to cover fstatx as well + + journal/JournalTrimmer: move C_RemoveSet struct + + rbd_mirror/ImageSynceThrottler: move struct to .cc + + libcephfs: add unmount function in cephfs.pyx + + rgw: fix typo of "minite" to "minute" in rgw_lc.cc + + rgw/rgw_lc.cc: fix sleep time according to the error message + + crush: don't normalize input of crush_ln iteratively + + crush: remove clutter + + mds: remove max_mds config option + + vstart.sh: add option to turn on multimds + + rgw: right parenthesis is missing in radosgw-admin help message on caps + + SQUASH: client: request AUTH caps on the directory during create if we'll need to check perms locally + + SQUASH: Revert "mds: ensure that change_attr reflects metadata changes on clients that hold CAP_FILE_EXCL" + + SQUASH: client: always take a change_attr update from the server if it's newer + + SQUASH: mds/client: don't get clever with ceph_mds_request_head_legacy encode/decode + + rgw/rgw_rados.h: remove unneeded class C_Tick + + SQUASH: client: querying for stx_version field requires getting all shared caps + + SQUASH: mds/client: add routines to copy to/from ceph_mds_request_head_legacy + + client: properly set inode number of created inode in replay request + + test/librbd/fsx: enable exclusive-lock feature in krbd mode + + os/bluestore/BlueFS: fix async compaction txn + + scripts/bdev_grep: parse bluefs style extents too + + SQUASH: client: request all shared caps if ctime was requested + + os/bluestore/BlueFS: factor unflushed log into runway calculation + + osd/ReplicatedBackend: move classes to cc file + + os/bluestore: honour allow-eio flag during read + + CmakeLists.txt: use LIB_RESOLV instead of resolv. + + osd/ReplicatedPG: move classes to .cc file + + librbd: potential double-unwatch of watch handle upon error + + cls/journal: add async client_update_state method + + journal: allow to trim journal for "laggy" clients + + librbd: optionally flag "laggy" journal clients disconnected + + rbd: new command to disconnect journal client + + rbd-mirror: decode_client_meta should return false on error + + rbd-mirror: resync was possible only when image replayer start had succeeded + + rbd-mirror: stop replay when client is disconnected + + rbd-mirror: option to automatically resync after journal client disconnect + + qa/workunits/cephtool/test.sh: fix omision of ceph-command + + os/bluestore: use global compressor if possible + + build/ops: fix /etc/os-release parsing in install-deps.sh + + osd/OSD.cc: remove repeated searching of map + + test/cephfs: add mount&&unmount test + + mds: s/used_ions/used_inos/ + + Add dependencies from ceph_smalliobenchrbd on cls_rbd, cls_journal, and cls_lock. + + ceph_test_objectstore: add SyntheticMatrixSharding + + ceph_test_objectstore: occasional umount/fsck/mount + + ceph_test_objectstore: test shards for longer + + crush/CrushCompiler.cc:884 bug fix: index out of range + + Makfile: Fix rocksdb error when make dist + + src/CMakeLists.txt: exclude parts not buildable on FreeBSD + + src/pybind/CMakeLists.txt: conditionaly build cython tools + + src/tools/CMakeLists.txt: conditionaly build ceph-client-debug + + src/test/objectstore/CMakeLists.txt: conditionaly build tests + + mds: trim null dentries proactively + + cmake: include(SIMDExt) in src/CMakeLists.txt + + mds: log path with CDir damage messages + + hint in extent_alloc code + + remove wrap argument and handle in wrappers + + Hint argument in alloc_blocks + test case changes ++++ 185 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/ceph/ceph-test.changes ++++ and /work/SRC/openSUSE:Factory/.ceph.new/ceph-test.changes ceph.changes: same change Old: ---- ceph-11.0.0+git.1472455009.a17726c.tar.bz2 ceph_ver_hack.sh New: ---- ceph-12.0.0+git.1489159457.410e200.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ceph-test.spec ++++++ --- /var/tmp/diff_new_pack.ROaBaU/_old 2017-03-13 15:31:09.442000998 +0100 +++ /var/tmp/diff_new_pack.ROaBaU/_new 2017-03-13 15:31:09.442000998 +0100 @@ -13,6 +13,7 @@ # # Please submit bugfixes or comments via http://tracker.ceph.com/ # +%bcond_with cephfs_java %if 0%{?suse_version} %bcond_without ceph_test_package %else @@ -26,15 +27,13 @@ # no gperftools/tcmalloc on s390(x) %bcond_with tcmalloc %endif -%bcond_with lowmem_builder +%bcond_without lowmem_builder %bcond_with minimal_debugging_information %if 0%{?fedora} || 0%{?rhel} -%bcond_without cephfs_java %bcond_with ocf %bcond_without selinux %endif %if 0%{?suse_version} -%bcond_with cephfs_java %bcond_without ocf %if %{with ocf} %global _with_ocf --with-ocf @@ -45,9 +44,11 @@ # LTTng-UST enabled on Fedora, RHEL 6+, and SLE (not openSUSE) %if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} %if ! 0%{?is_opensuse} +%ifarch x86_64 aarch64 %bcond_without lttng %endif %endif +%endif %if %{with selinux} # get selinux policy version @@ -66,7 +67,7 @@ # common ################################################################################# Name: ceph-test -Version: 11.0.0+git.1472455009.a17726c +Version: 12.0.0+git.1489159457.410e200 Release: 0 Summary: Ceph benchmarks and test tools License: LGPL-2.1 and CC-BY-SA-1.0 and GPL-2.0 and BSL-1.0 and GPL-2.0-with-autoconf-exception and BSD-3-Clause and MIT @@ -75,7 +76,6 @@ %endif URL: http://ceph.com/ Source0: ceph-%{version}.tar.bz2 -Source97: ceph_ver_hack.sh Source98: README-ceph-test.txt Source99: ceph-rpmlintrc # _insert_obs_source_lines_here @@ -83,7 +83,7 @@ %if 0%{?is_opensuse} ExclusiveArch: x86_64 aarch64 ppc64 ppc64le %else -ExclusiveArch: x86_64 aarch64 +ExclusiveArch: x86_64 aarch64 ppc64le %endif %endif ################################################################################# @@ -92,6 +92,7 @@ + Requires: ceph-common Requires: xmlstarlet Requires(post): binutils @@ -104,7 +105,7 @@ BuildRequires: selinux-policy-devel BuildRequires: /usr/share/selinux/devel/policyhelp %endif -BuildRequires: boost-devel +BuildRequires: bc BuildRequires: cmake BuildRequires: cryptsetup BuildRequires: fuse-devel @@ -113,7 +114,6 @@ %if 0%{with tcmalloc} BuildRequires: gperftools-devel %endif -BuildRequires: hdparm BuildRequires: jq BuildRequires: leveldb-devel > 1.2 BuildRequires: libaio-devel @@ -218,46 +218,125 @@ ################################################################################# # packages ################################################################################# +%if 0%{?suse_version} +%endif %if 0%{with selinux} %endif %if 0%{?suse_version} %endif -%if 0%{?fedora} || 0%{?rhel} -%endif %if 0%{with xio} %endif %if 0%{?suse_version} %endif +%if 0%{?suse_version} +%endif %if 0%{with xio} %endif +%if 0%{?suse_version} +%endif +%if 0%{?suse_version} +%endif %if 0%{?fedora} || 0%{?rhel} %endif %if 0%{?suse_version} %endif +%if 0%{?suse_version} +%endif +%if 0%{?suse_version} +%endif +%if 0%{?suse_version} +%endif +%if 0%{?suse_version} +%endif +%if 0%{?suse_version} +%endif +%if 0%{?suse_version} +%endif %if 0%{with selinux} %endif %if 0%{?rhel} || 0%{?fedora} %endif %if %{with ocf} +%if 0%{?suse_version} +%endif +%endif +%if 0%{?suse_version} %endif %if 0%{?fedora} || 0%{?rhel} %endif %if 0%{?suse_version} %endif +%if 0%{?suse_version} +%endif %if 0%{?rhel} || 0%{?fedora} %endif +%if 0%{?suse_version} +%endif +%if 0%{?suse_version} +%endif +%if 0%{?suse_version} +%endif +%if 0%{?suse_version} +%endif +%if 0%{?suse_version} +%endif +%if 0%{?suse_version} +%endif +%if 0%{?suse_version} +%endif +%if 0%{?suse_version} +%endif +%if 0%{?suse_version} +%endif +%if 0%{?suse_version} +%endif %if 0%{?rhel} || 0%{?fedora} %endif +%if 0%{?suse_version} +%endif +%if 0%{?suse_version} +%endif +%if 0%{?suse_version} +%endif +%if 0%{?suse_version} +%endif %if 0%{?rhel} || 0%{?fedora} %endif +%if 0%{?suse_version} +%endif +%if 0%{?suse_version} +%endif +%if 0%{?suse_version} +%endif +%if 0%{?suse_version} +%endif +%if 0%{?suse_version} +%endif %if 0%{with ceph_test_package} +%if 0%{?suse_version} +%endif %endif %if 0%{with cephfs_java} +%if 0%{?suse_version} +%endif +%if 0%{?suse_version} +%endif +%if 0%{?suse_version} +%endif %endif %if 0%{with selinux} +%if 0%{?suse_version} +%endif +%endif +%if 0%{?suse_version} %endif %prep +%if 0%{?rhel} +%autosetup -p1 -n @TARBALL_BASENAME@ +%endif +%if ! 0%{?rhel} %autosetup -p1 -n ceph-%version +%endif %build %if 0%{with cephfs_java} @@ -279,6 +358,8 @@ export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$RPM_OPT_FLAGS" +env | sort + mkdir build cd build cmake .. \ @@ -289,7 +370,9 @@ -DCMAKE_INSTALL_SYSCONFDIR=%{_sysconfdir} \ -DCMAKE_INSTALL_MANDIR=%{_mandir} \ -DCMAKE_INSTALL_DOCDIR=%{_docdir}/ceph \ + -DWITH_EMBEDDED=OFF \ -DWITH_MANPAGE=ON \ + -DWITH_PYTHON3=ON \ -DWITH_SYSTEMD=ON \ %if 0%{?rhel} && ! 0%{?centos} -DWITH_SUBMAN=ON \ @@ -364,7 +447,7 @@ # we have dropped sysvinit bits rm -f %{buildroot}/%{_sysconfdir}/init.d/ceph popd -install -D src/etc-rbdmap %{buildroot}%{_sysconfdir}/ceph/rbdmap +install -m 0644 -D src/etc-rbdmap %{buildroot}%{_sysconfdir}/ceph/rbdmap %if 0%{?fedora} || 0%{?rhel} install -m 0644 -D etc/sysconfig/ceph %{buildroot}%{_sysconfdir}/sysconfig/ceph %endif @@ -400,6 +483,7 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/mon mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/osd mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/mds +mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/mgr mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/radosgw mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-osd mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-mds @@ -418,7 +502,6 @@ rm -rf %{buildroot}%{_bindir}/ceph-run rm -rf %{buildroot}%{_bindir}/ceph-dencoder rm -rf %{buildroot}%{_bindir}/ceph-detect-init -rm -rf %{buildroot}%{_unitdir}/[email protected] rm -rf %{buildroot}%{_bindir}/cephfs-data-scan rm -rf %{buildroot}%{_bindir}/cephfs-journal-tool rm -rf %{buildroot}%{_bindir}/cephfs-table-tool @@ -492,6 +575,10 @@ rm -rf %{buildroot}%{_mandir}/man8/ceph-mds.8* rm -rf %{buildroot}%{_unitdir}/[email protected] rm -rf %{buildroot}%{_unitdir}/ceph-mds.target +rm -rf %{buildroot}%{_bindir}/ceph-mgr +rm -rf %{buildroot}%{_libdir}/ceph/mgr +rm -rf %{buildroot}%{_unitdir}/[email protected] +rm -rf %{buildroot}%{_unitdir}/ceph-mgr.target rm -rf %{buildroot}%{_bindir}/ceph-mon rm -rf %{buildroot}%{_bindir}/ceph-rest-api rm -rf %{buildroot}%{_mandir}/man8/ceph-mon.8* @@ -502,6 +589,8 @@ rm -rf %{buildroot}%{_bindir}/ceph-fuse rm -rf %{buildroot}%{_mandir}/man8/ceph-fuse.8* rm -rf %{buildroot}%{_sbindir}/mount.fuse.ceph +rm -rf %{buildroot}%{_unitdir}/[email protected] +rm -rf %{buildroot}%{_unitdir}/ceph-fuse.target rm -rf %{buildroot}%{_bindir}/rbd-fuse rm -rf %{buildroot}%{_mandir}/man8/rbd-fuse.8* rm -rf %{buildroot}%{_bindir}/rbd-mirror @@ -537,11 +626,13 @@ rm -rf %{buildroot}%{_unitdir}/[email protected] rm -rf %{buildroot}%{_prefix}/lib/ocf/resource.d/ceph/rbd rm -rf %{buildroot}%{_libdir}/librados.so.* +rm -rf %{buildroot}%{_libdir}/ceph/libceph-common.so* rm -rf %{buildroot}%{_libdir}/librados_tp.so.* rm -rf %{buildroot}%{_includedir}/rados/librados.h rm -rf %{buildroot}%{_includedir}/rados/librados.hpp rm -rf %{buildroot}%{_includedir}/rados/buffer.h rm -rf %{buildroot}%{_includedir}/rados/buffer_fwd.h +rm -rf %{buildroot}%{_includedir}/rados/inline_memory.h rm -rf %{buildroot}%{_includedir}/rados/page.h rm -rf %{buildroot}%{_includedir}/rados/crc32c.h rm -rf %{buildroot}%{_includedir}/rados/rados_types.h @@ -570,12 +661,17 @@ rm -rf %{buildroot}%{_includedir}/rados/librgw.h rm -rf %{buildroot}%{_includedir}/rados/rgw_file.h rm -rf %{buildroot}%{_libdir}/librgw.so +rm -rf %{buildroot}%{python_sitearch}/rgw.so +rm -rf %{buildroot}%{python_sitearch}/rgw-*.egg-info +rm -rf %{buildroot}%{python3_sitearch}/rgw.cpython*.so +rm -rf %{buildroot}%{python3_sitearch}/rgw-*.egg-info rm -rf %{buildroot}%{python_sitearch}/rbd.so rm -rf %{buildroot}%{python_sitearch}/rbd-*.egg-info rm -rf %{buildroot}%{python3_sitearch}/rbd.cpython*.so rm -rf %{buildroot}%{python3_sitearch}/rbd-*.egg-info rm -rf %{buildroot}%{_libdir}/libcephfs.so.* rm -rf %{buildroot}%{_includedir}/cephfs/libcephfs.h +rm -rf %{buildroot}%{_includedir}/cephfs/ceph_statx.h rm -rf %{buildroot}%{_libdir}/libcephfs.so rm -rf %{buildroot}%{python_sitearch}/cephfs.so rm -rf %{buildroot}%{python_sitearch}/cephfs-*.egg-info @@ -676,6 +772,16 @@ %endif %if 0%{?suse_version} %endif +%if 0%{?fedora} || 0%{?rhel} +%endif +%if 0%{?suse_version} +%endif +%if 0%{?fedora} || 0%{?rhel} +%endif +%if 0%{?suse_version} +%endif +%if 0%{?fedora} || 0%{?rhel} +%endif %if 0%{?suse_version} %endif %if 0%{?fedora} || 0%{?rhel} ++++++ ceph.spec ++++++ ++++ 787 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/ceph/ceph.spec ++++ and /work/SRC/openSUSE:Factory/.ceph.new/ceph.spec ++++++ _service ++++++ --- /var/tmp/diff_new_pack.ROaBaU/_old 2017-03-13 15:31:09.557984606 +0100 +++ /var/tmp/diff_new_pack.ROaBaU/_new 2017-03-13 15:31:09.561984041 +0100 @@ -1,13 +1,13 @@ <services> <service name="tar_scm" mode="disabled"> - <param name="versionformat">11.0.0+git.%ct.%h</param> + <param name="versionformat">12.0.0+git.%ct.%h</param> <param name="url">git://github.com/SUSE/ceph.git</param> <param name="revision">ses5</param> <param name="filename">ceph</param> <param name="scm">git</param> <param name="package-meta">no</param> <param name="changesgenerate">enable</param> - <param name="commandtorun">sh ../../../ceph_ver_hack.sh</param> + <param name="commandtorun">sh etc/ceph_ver_hack.sh</param> </service> <service name="extract_ceph_spec" mode="disabled" /> <service name="recompress" mode="disabled"> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.ROaBaU/_old 2017-03-13 15:31:09.585980650 +0100 +++ /var/tmp/diff_new_pack.ROaBaU/_new 2017-03-13 15:31:09.589980084 +0100 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/SUSE/ceph.git</param> - <param name="changesrevision">a17726c4326ee895bf40686e3340c04c6963c153</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">410e200be5f33c0f2079a3ad1c0cbc2464236e53</param></service></servicedata> \ No newline at end of file ++++++ ceph-11.0.0+git.1472455009.a17726c.tar.bz2 -> ceph-12.0.0+git.1489159457.410e200.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/ceph/ceph-11.0.0+git.1472455009.a17726c.tar.bz2 /work/SRC/openSUSE:Factory/.ceph.new/ceph-12.0.0+git.1489159457.410e200.tar.bz2 differ: char 11, line 1 ++++++ pre_checkin.sh ++++++ --- /var/tmp/diff_new_pack.ROaBaU/_old 2017-03-13 15:31:09.645972171 +0100 +++ /var/tmp/diff_new_pack.ROaBaU/_new 2017-03-13 15:31:09.649971606 +0100 @@ -169,8 +169,11 @@ "Source0:"*) line=`echo $line | sed 's/%{name}/ceph/g'` ;; + "ExclusiveArch:"*) + line=`echo $line | sed 's/s390\S*//g'` + ;; "%autosetup -p1") - line="$line -n ceph-%version" + line="%autosetup -p1 -n ceph-%version" ;; "Requires:"*) if [[ $in_package == false ]]; then @@ -284,5 +287,4 @@ transform_spec_file $SPEC_FILE $PACKAGE "$rm_files" "$summ" "$desc" "$reqs" > $PACKAGE.spec insert_line_before "${PACKAGE}.spec" "Source99: ceph-rpmlintrc" "_insert_obs_source_lines_here" insert_line_before "${PACKAGE}.spec" "Source98: README-ceph-test.txt" "^Source99:" -insert_line_before "${PACKAGE}.spec" "Source97: ceph_ver_hack.sh" "^Source98:" copy_changes_file $PACKAGE
