git.annexia.org
/
fedora-ocaml-rebuild.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Restrict ExcludeArch check to just ocaml* packages
[fedora-ocaml-rebuild.git]
/
Goalfile
diff --git
a/Goalfile
b/Goalfile
index
8bedabd
..
d9866f1
100644
(file)
--- a/
Goalfile
+++ b/
Goalfile
@@
-198,7
+198,6
@@
let packages = [
"haxe",
"hevea",
"hivex",
"haxe",
"hevea",
"hivex",
- "laby",
"libguestfs",
"libnbd",
"opam",
"libguestfs",
"libnbd",
"opam",
@@
-225,14
+224,11
@@
pure function get-source-packages () returning strings = {
for pkg in %packages; do
spec=$pkg/%fedora-branch/$pkg.spec
if [ -f $spec ]; then
for pkg in %packages; do
spec=$pkg/%fedora-branch/$pkg.spec
if [ -f $spec ]; then
- # Check that all spec files have disabled the broken
- # "package notes" misfeature.
- if ! grep -sq "%%undefine _package_note_flags" $spec ; then
- echo "ERROR: $pkg does not %%undefine _package_note_flags" >&2
- exit 1
- fi
# Check that the spec file excludes i686.
# Check that the spec file excludes i686.
- if ! rpmspec -P $spec | grep -sq 'ExcludeArch:.*i386' ; then
+ # Only implement this check for ocaml-* packages, as the
+ # other packages are more complicated.
+ if [[ "$spec" =~ ^ocaml ]] &&
+ ! rpmspec -P $spec | grep -sq 'ExcludeArch:.*i386' ; then
echo "ERROR: $pkg does not ExcludeArch: %%{ix86}" >&2
exit 1
fi
echo "ERROR: $pkg does not ExcludeArch: %%{ix86}" >&2
exit 1
fi