Accepting request 223631 from Base:System

- switch to _service fetching from github
- fix brp-symlinks to avoid errors on links to alternatives and
  remove check-broken-symlinks.diff

OBS-URL: https://build.opensuse.org/request/show/223631
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/brp-check-suse?expand=0&rev=46
This commit is contained in:
Tomáš Chvátal 2014-02-25 15:41:10 +00:00 committed by Git OBS Bridge
commit 127acfdba8
6 changed files with 27 additions and 29 deletions

13
_service Normal file
View File

@ -0,0 +1,13 @@
<services>
<service name="tar_scm" mode="disabled">
<param name="version">13.2</param>
<param name="versionformat">13.2+git%cd.%h</param>
<param name="url">git://github.com/openSUSE/brp-check-suse.git</param>
<param name="scm">git</param>
</service>
<service name="recompress" mode="disabled">
<param name="compression">xz</param>
<param name="file">*.tar</param>
</service>
<service name="set_version" mode="disabled"/>
</services>

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5d580ca5242d8c23f5943b7893a84e514c54a7d72848f96f754813cc314d2dab
size 63971

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f62c7dc246ed7a9eb53fcc34e5264df3faa056941c1b4cacaeb9d8e792f73e5b
size 66000

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Feb 24 09:14:36 UTC 2014 - coolo@suse.com
- switch to _service fetching from github
- fix brp-symlinks to avoid errors on links to alternatives and
remove check-broken-symlinks.diff
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Nov 12 12:33:25 UTC 2012 - coolo@suse.com Mon Nov 12 12:33:25 UTC 2012 - coolo@suse.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package brp-check-suse # spec file for package brp-check-suse
# #
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -23,19 +23,14 @@ License: GPL-2.0+
Group: Development/Tools/Building Group: Development/Tools/Building
# we need the full perl because of XML Parsing and utf-8 # we need the full perl because of XML Parsing and utf-8
Requires: perl Requires: perl
Version: 1.0 Version: 13.2+git20140224.a3fcc48
Release: 0 Release: 0
Url: http://gitorious.org/opensuse/brp-check-suse/ Url: http://gitorious.org/opensuse/brp-check-suse/
# #
# Note: don't rebuild this manually. Instead submit your patches # Note: don't rebuild this manually. Instead submit your patches
# for inclusion in the git repo! # for inclusion in the git repo at https://github.com/openSUSE/brp-check-suse
# #
# git clone git://gitorious.org/opensuse/brp-check-suse.git Source0: %{name}-%{version}.tar.xz
# cd post-build-checks
# make package
#
Source0: %{name}-%{version}.tar.bz2
Patch0: check-broken-symlinks.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%global provfind sh -c "grep -v 'brp-desktop.data' | %__find_provides" %global provfind sh -c "grep -v 'brp-desktop.data' | %__find_provides"
%global __find_provides %provfind %global __find_provides %provfind
@ -50,7 +45,6 @@ build root checking or in parts implemeting SUSE policies.
%ifnarch x86_64 s390x ppc64 %ifnarch x86_64 s390x ppc64
rm brp-65-lib64-linux rm brp-65-lib64-linux
%endif %endif
%patch0 -p1
%build %build
# nothing to do # nothing to do

View File

@ -1,16 +0,0 @@
Index: brp-check-suse-1.0/brp-25-symlink
===================================================================
--- brp-check-suse-1.0.orig/brp-25-symlink 2012-03-13 13:52:11.000000000 +0100
+++ brp-check-suse-1.0/brp-25-symlink 2012-07-01 21:37:11.698384089 +0200
@@ -79,6 +79,11 @@ do
fi
done
+ if test "$link" = "$link_dest"; then
+ echo "ERROR: $link points to itself (as $orig_link_dest)"
+ exit 1
+ fi
+
# black list
case "$link,$link_dest" in
*,/var/lib/named*)