Architecture specific change in rpms/kf5-akonadi-calendar.git
by githook-noreply@fedoraproject.org
The package rpms/kf5-akonadi-calendar.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/kf5-akonadi-calendar.git/commit/?....
Change:
+ExclusiveArch: x86_64 aarch64 %{arm}
Thanks.
Full change:
============
commit 22ae2fb741ef6bb428c9ea9594d9660b605362ae
Author: Troy Dawson <tdawson(a)redhat.com>
Date: Tue May 5 12:49:53 2020 -0700
libical now in aarch64 for RHEL8
diff --git a/kf5-akonadi-calendar.spec b/kf5-akonadi-calendar.spec
index 65cc99d..424c8e7 100644
--- a/kf5-akonadi-calendar.spec
+++ b/kf5-akonadi-calendar.spec
@@ -25,7 +25,7 @@ Source0: http://download.kde.org/%{stable}/release-service/%{version}/src
# libical (and thus kcalendarcore) not on all arches for RHEL8.
%if 0%{?rhel} == 8
-ExclusiveArch: x86_64 %{arm}
+ExclusiveArch: x86_64 aarch64 %{arm}
%else
# handled by qt5-srpm-macros, which defines %%qt5_qtwebengine_arches
%{?qt5_qtwebengine_arches:ExclusiveArch: %{qt5_qtwebengine_arches}}
4 years
Architecture specific change in rpms/bowtie2.git
by githook-noreply@fedoraproject.org
The package rpms/bowtie2.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/bowtie2.git/commit/?id=5a5cc222bf....
Change:
+%ifnarch x86_64
Thanks.
Full change:
============
commit 5a5cc222bffbf8fb11622102366a53d8a023a245
Author: Jun Aruga <jaruga(a)redhat.com>
Date: Tue May 5 20:58:11 2020 +0200
Initial import (rhbz#1824348).
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..575d5f9
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/v2.4.1.tar.gz
diff --git a/README.md b/README.md
deleted file mode 100644
index 6b09bc3..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# bowtie2
-
-The bowtie2 package
\ No newline at end of file
diff --git a/bowtie2-makefile-cxxflags.patch b/bowtie2-makefile-cxxflags.patch
new file mode 100644
index 0000000..d3f7e5c
--- /dev/null
+++ b/bowtie2-makefile-cxxflags.patch
@@ -0,0 +1,31 @@
+diff --git a/Makefile b/Makefile
+index 9b6a46e..df5a817 100644
+--- a/Makefile
++++ b/Makefile
+@@ -207,18 +207,18 @@ else ifeq (amd64,$(shell uname -m))
+ else ifeq (aarch64,$(shell uname -m))
+ BITS := 64
+ SSE_FLAG :=
+- CXXFLAGS := -fopenmp-simd
+- CPPFLAGS := -Ithird_party/simde
++ CXXFLAGS += -fopenmp-simd
++ CPPFLAGS += -Ithird_party/simde
+ else ifeq (s390x,$(shell uname -m))
+ BITS := 64
+ SSE_FLAG :=
+- CXXFLAGS := -fopenmp-simd
+- CPPFLAGS := -Ithird_party/simde
++ CXXFLAGS += -fopenmp-simd
++ CPPFLAGS += -Ithird_party/simde
+ SANITIZER_FLAGS :=
+ else ifeq (ppc64le,$(shell uname -m))
+ BITS := 64
+ SSE_FLAG :=
+- CXXFLAGS := -fopenmp-simd
++ CXXFLAGS += -fopenmp-simd
+ CPPFLAGS += -Ithird_party/simde
+ SANITIZER_FLAGS :=
+ endif
+--
+2.25.4
+
diff --git a/bowtie2.spec b/bowtie2.spec
new file mode 100644
index 0000000..c8d4954
--- /dev/null
+++ b/bowtie2.spec
@@ -0,0 +1,134 @@
+Name: bowtie2
+Version: 2.4.1
+Release: 1%{?dist}
+# Use the word "ultra fast" rather than "ultrafast".
+# https://github.com/BenLangmead/bowtie2/issues/291
+Summary: An ultra fast and memory-efficient read aligner
+# * bowtie2: GPLv3+
+# * TinyThread++: zlib, for files: tinythread.{h,cpp} fast_mutex.h
+# https://tinythreadpp.bitsnbites.eu/
+# https://gitorious.org/tinythread/tinythreadpp
+License: GPLv3+ and zlib
+URL: http://bowtie-bio.sourceforge.net/bowtie2/index.shtml
+Source0: https://github.com/BenLangmead/%{name}/archive/v%{version}.tar.gz
+# Fix to build with given CXXFLAGS.
+# https://github.com/BenLangmead/bowtie2/pull/296
+Patch0: bowtie2-makefile-cxxflags.patch
+BuildRequires: gcc-c++
+BuildRequires: help2man
+BuildRequires: libasan
+BuildRequires: libubsan
+BuildRequires: perl-generators
+BuildRequires: perl-interpreter
+BuildRequires: perl(Clone)
+BuildRequires: perl(File::Which)
+BuildRequires: perl(FindBin)
+BuildRequires: perl(Sys::Hostname)
+BuildRequires: perl(Test::Deep)
+BuildRequires: perl(lib)
+BuildRequires: python3
+%ifarch x86_64
+BuildRequires: tbb-devel
+%else
+BuildRequires: simde-devel
+%endif
+BuildRequires: zlib-devel
+# * 32-bit CPU architectures: not supported. See Makefile.
+# * s390x: not ready to ship it. We take the conservative way.
+# as it is used for the research.
+# https://github.com/BenLangmead/bowtie2/issues/286
+ExcludeArch: %{ix86} %{arm} s390x
+
+# TinyThread++
+Provides: bundled(tiny-thread) = 1.1
+
+%description
+
+Bowtie 2 is an ultra fast and memory-efficient tool for aligning sequencing
+reads to long reference sequences. It is particularly good at aligning reads
+of about 50 up to 100s or 1,000s of characters, and particularly good at
+aligning to relatively long (e.g. mammalian) genomes. Bowtie 2 indexes the
+genome with an FM Index to keep its memory footprint small: for the human
+genome, its memory footprint is typically around 3.2 GB. Bowtie 2 supports
+gapped, local, and paired-end alignment modes.
+
+%prep
+%autosetup
+
+# Remove the directory to avoid building bowtie with bundled libraries.
+rm -rf third_party
+
+# Invalid double quote characters are used in the code.
+# https://github.com/BenLangmead/bowtie2/issues/278
+sed -e 's//"/g' -e 's//"/g' -i processor_support.h
+
+# Fix shebang to use the system interpreters.
+sed -i '1s|/usr/bin/env perl|%{_bindir}/perl|' bowtie2
+for file in bowtie2-{build,inspect}; do
+ sed -i '1s|/usr/bin/env python3|%{__python3}|' "${file}"
+done
+
+%build
+# Set build flags.
+# https://src.fedoraproject.org/rpms/redhat-rpm-config/blob/master/f/buildf...
+%set_build_flags
+# Set flags considering the upstream testing cases for each architecture.
+# https://github.com/BenLangmead/bowtie2/blob/master/.travis.yml
+%ifnarch x86_64
+export POPCNT_CAPABILITY=0
+export NO_TBB=1
+%endif
+
+# Build with the target "all" rather than "allall"
+# to skip the builds of debug and sanitized binaries
+# saving the build time.
+%make_build all
+
+%install
+%make_install PREFIX="%{_prefix}"
+
+mkdir -p %{buildroot}%{_mandir}/man1
+# Set version string explicitly to avoid showing the wrong command.
+# https://github.com/BenLangmead/bowtie2/issues/294
+for cmd in bowtie2 bowtie2-{build,inspect}; do
+ help2man -N -s 1 -o "%{buildroot}%{_mandir}/man1/${cmd}.1" \
+ --version-string="%{version}" \
+ "%{buildroot}%{_bindir}/${cmd}"
+done
+
+%check
+for cmd in bowtie2 bowtie2-{build,inspect}; do
+ ./"${cmd}" --version | grep 'version %{version}'
+done
+
+# Skip tests for the debug and sanitized binaries not shipped.
+sed -i '/my $binary_type/ s/"release", "debug", "sanitized"/"release"/' \
+ scripts/test/simple_tests.pl
+
+# See scripts/test/simple_tests.sh for the options.
+ASAN_OPTIONS="halt_on_error=1" \
+UBSAN_OPTIONS="halt_on_error=1" \
+scripts/test/simple_tests.pl \
+ --bowtie2=./bowtie2 \
+ --bowtie2-build=./bowtie2-build \
+ --compressed
+
+%files
+%doc AUTHORS MANUAL MANUAL.markdown NEWS TUTORIAL
+%license LICENSE
+%{_bindir}/bowtie2
+%{_bindir}/bowtie2-align-l
+%{_bindir}/bowtie2-align-s
+%{_bindir}/bowtie2-build
+%{_bindir}/bowtie2-build-l
+%{_bindir}/bowtie2-build-s
+%{_bindir}/bowtie2-inspect
+%{_bindir}/bowtie2-inspect-l
+%{_bindir}/bowtie2-inspect-s
+%{_mandir}/man1/bowtie2.1*
+%{_mandir}/man1/bowtie2-build.1*
+%{_mandir}/man1/bowtie2-inspect.1*
+
+%changelog
+* Sat Mar 28 2020 Jun Aruga <jaruga(a)redhat.com> - 2.4.1-1
+- Initial package
diff --git a/sources b/sources
new file mode 100644
index 0000000..472934d
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (v2.4.1.tar.gz) = b9bd5e0009b8a05b85f882ea79ce4984b46eed1658012b0225120ce3de66f81fda5dd200c95ce144bed808334f959c2fe986849b0a644d85514d388b00282f67
4 years
Architecture specific change in rpms/firefox.git
by githook-noreply@fedoraproject.org
The package rpms/firefox.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/firefox.git/commit/?id=be267b48e7....
Change:
+ExcludeArch: aarch64
Thanks.
Full change:
============
commit be267b48e73d8a287e6562af2d395dc9ee22c1e6
Author: Martin Stransky <stransky(a)redhat.com>
Date: Tue May 5 20:08:47 2020 +0200
Temporary disable aarch64
diff --git a/firefox.spec b/firefox.spec
index 347f858..f604edd 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -10,8 +10,8 @@ ExcludeArch: armv7hl
%endif
# Disabled due to https://pagure.io/fedora-infrastructure/issue/7581
ExcludeArch: s390x
-# Disabled due to neon build error
-# ExcludeArch: aarch64
+# Disabled due to linker failures
+ExcludeArch: aarch64
%global enable_mozilla_crashreporter 0
%ifarch x86_64 %{ix86}
4 years
Architecture specific change in rpms/firefox.git
by githook-noreply@fedoraproject.org
The package rpms/firefox.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/firefox.git/commit/?id=be267b48e7....
Change:
+ExcludeArch: aarch64
Thanks.
Full change:
============
commit be267b48e73d8a287e6562af2d395dc9ee22c1e6
Author: Martin Stransky <stransky(a)redhat.com>
Date: Tue May 5 20:08:47 2020 +0200
Temporary disable aarch64
diff --git a/firefox.spec b/firefox.spec
index 347f858..f604edd 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -10,8 +10,8 @@ ExcludeArch: armv7hl
%endif
# Disabled due to https://pagure.io/fedora-infrastructure/issue/7581
ExcludeArch: s390x
-# Disabled due to neon build error
-# ExcludeArch: aarch64
+# Disabled due to linker failures
+ExcludeArch: aarch64
%global enable_mozilla_crashreporter 0
%ifarch x86_64 %{ix86}
4 years
Architecture specific change in rpms/firefox.git
by githook-noreply@fedoraproject.org
The package rpms/firefox.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/firefox.git/commit/?id=be267b48e7....
Change:
+ExcludeArch: aarch64
Thanks.
Full change:
============
commit be267b48e73d8a287e6562af2d395dc9ee22c1e6
Author: Martin Stransky <stransky(a)redhat.com>
Date: Tue May 5 20:08:47 2020 +0200
Temporary disable aarch64
diff --git a/firefox.spec b/firefox.spec
index 347f858..f604edd 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -10,8 +10,8 @@ ExcludeArch: armv7hl
%endif
# Disabled due to https://pagure.io/fedora-infrastructure/issue/7581
ExcludeArch: s390x
-# Disabled due to neon build error
-# ExcludeArch: aarch64
+# Disabled due to linker failures
+ExcludeArch: aarch64
%global enable_mozilla_crashreporter 0
%ifarch x86_64 %{ix86}
4 years
Architecture specific change in rpms/firefox.git
by githook-noreply@fedoraproject.org
The package rpms/firefox.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/firefox.git/commit/?id=be267b48e7....
Change:
+ExcludeArch: aarch64
Thanks.
Full change:
============
commit be267b48e73d8a287e6562af2d395dc9ee22c1e6
Author: Martin Stransky <stransky(a)redhat.com>
Date: Tue May 5 20:08:47 2020 +0200
Temporary disable aarch64
diff --git a/firefox.spec b/firefox.spec
index 347f858..f604edd 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -10,8 +10,8 @@ ExcludeArch: armv7hl
%endif
# Disabled due to https://pagure.io/fedora-infrastructure/issue/7581
ExcludeArch: s390x
-# Disabled due to neon build error
-# ExcludeArch: aarch64
+# Disabled due to linker failures
+ExcludeArch: aarch64
%global enable_mozilla_crashreporter 0
%ifarch x86_64 %{ix86}
4 years
Architecture specific change in rpms/kf5-akonadi-search.git
by githook-noreply@fedoraproject.org
The package rpms/kf5-akonadi-search.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/kf5-akonadi-search.git/commit/?id....
Change:
+ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
Thanks.
Full change:
============
commit 530b6caed63e5a2329c2092682d6ccdcd343d065
Author: Troy Dawson <tdawson(a)redhat.com>
Date: Tue May 5 11:06:54 2020 -0700
libical now in aarch64 for RHEL8
diff --git a/kf5-akonadi-search.spec b/kf5-akonadi-search.spec
index 78051fe..cf5a22b 100644
--- a/kf5-akonadi-search.spec
+++ b/kf5-akonadi-search.spec
@@ -25,7 +25,7 @@ Source0: http://download.kde.org/%{stable}/release-service/%{version}/src/%{fram
# libical (and thus kcalendarcore) not on all arches for RHEL8.
%if 0%{?rhel} == 8
-ExclusiveArch: x86_64 ppc64le %{arm}
+ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
%endif
BuildRequires: extra-cmake-modules
4 years
Architecture specific change in rpms/ngspice.git
by githook-noreply@fedoraproject.org
The package rpms/ngspice.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/ngspice.git/commit/?id=43fa62d918....
Change:
-%ifarch x86_64 sparc64 ppc64 amd64
Thanks.
Full change:
============
commit 43fa62d918fa0a8eda1824c821699b8fa7fc2d41
Author: Mamoru TASAKA <mtasaka(a)fedoraproject.org>
Date: Wed May 6 01:44:10 2020 +0900
Update to 32
Use upstream git to use some upstream fixes since release
diff --git a/.gitignore b/.gitignore
index d9077ea..6d2cee0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,5 @@ ngspice-rework-20.cvs20100719.tar.bz2
/ngspice-30-manual.pdf
/ngspice-31.tar.gz
/ngspice-31-manual.pdf
+/ngspice-20200505T2059.tar.gz
+/ngspice-32-manual.pdf
diff --git a/create-ngspice-git-bare-tarball.sh b/create-ngspice-git-bare-tarball.sh
new file mode 100644
index 0000000..93333e8
--- /dev/null
+++ b/create-ngspice-git-bare-tarball.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+set -x
+set -e
+
+REPONAME=ngspice
+GITURL=https://git.code.sf.net/p/ngspice/${REPONAME}.git
+
+DATE=$(date '+%Y%m%d')
+TIME=$(date '+%H%M')
+
+TARNAME=${REPONAME}-${DATE}T${TIME}.tar.gz
+
+PWDDIR=$(pwd)
+TMPDIR=$(mktemp -d /var/tmp/ngspice-XXXXXX)
+pushd $TMPDIR
+
+git clone --mirror $GITURL
+
+cd ./${REPONAME}.git
+git log | head -n 5
+cd ..
+
+tar czf ${TARNAME} ${REPONAME}.git/
+
+cp -p ${TARNAME} $PWDDIR
+popd
+rm -rf $TMPDIR
diff --git a/ngspice-32-gcc10-nocommon.patch b/ngspice-32-gcc10-nocommon.patch
new file mode 100644
index 0000000..50d74e3
--- /dev/null
+++ b/ngspice-32-gcc10-nocommon.patch
@@ -0,0 +1,22 @@
+--- ngspice-32/src/xspice/icm/dlmain.h.gcc10 2020-05-03 16:35:31.000000000 +0900
++++ ngspice-32/src/xspice/icm/dlmain.h 2020-05-05 15:22:20.263239365 +0900
+@@ -5,6 +5,6 @@
+ #include "ngspice/mifproto.h"
+ #include "ngspice/dllitf.h"
+
+-struct coreInfo_t *coreitf;
++extern struct coreInfo_t *coreitf;
+
+ #endif /* dlmain.h */
+diff --git a/src/ngsconvert.c b/src/ngsconvert.c
+index f8a7a5176..6e09b9033 100644
+--- a/src/ngsconvert.c
++++ b/src/ngsconvert.c
+@@ -24,7 +24,6 @@ FILE *cp_err = NULL;
+ FILE *cp_curin = NULL;
+ FILE *cp_curout = NULL;
+ FILE *cp_curerr = NULL;
+-int cp_maxhistlength;
+ bool cp_debug = FALSE;
+ char cp_chars[128];
+ bool cp_nocc = TRUE;
diff --git a/ngspice.spec b/ngspice.spec
index 3b5036a..d66bd0e 100644
--- a/ngspice.spec
+++ b/ngspice.spec
@@ -5,40 +5,61 @@
# - Provides tclspice capabilities
# Chitlesh Goorah
-#
-## To download development trunk
-#
-# cvs -d:pserver:anonymous@ngspice.cvs.sourceforge.net:/cvsroot/ngspice login
-# cvs -z3 -d:pserver:anonymous@ngspice.cvs.sourceforge.net:/cvsroot/ngspice export -DNOW ngspice
-# tar cjf ~/rpmbuild/SOURCES/ngspice-rework-23.`date '+%Y%m%d'`cvs.tar.bz2 ngspice
+%global userelease 0
+%global usegitbare 1
+
+%if 0%{?usegitbare} < 1
+# force
+%global userelease 1
+%endif
+
+%global mainver 32
+%undefine prever
+%global prerpmver %(echo "%{?prever}" | sed -e 's|-||g')
-# Toggle the following declaration when using version controlled snapshots
-%global devel 0
+%global mainrel 1
+
+%if 0%{?usegitbare} >= 1
+%global gitcommit bbe81ca8f86a8648aa698c2b95fafcd4ba98b73f
+%global gitdate 20200405
+%global shortcommit %(c=%{gitcommit}; echo ${c:0:7})
+
+%global tarballdate 20200505
+%global tarballtime 2059
+%endif
+
+%if 0%{?userelease} >= 1
+%global fedorarel %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}
+%endif
+%if 0%{?usegitbare} >= 1
+%global fedorarel %{?prever:0.}%{mainrel}.D%{gitdate}git%{shortcommit}
+%endif
%undefine _changelog_trimtime
Name: ngspice
-Version: 31
-%if %{?devel}
-%global snap .20111129cvs
-%endif
-Release: 4%{?snap}%{?dist}.respin2
+Version: %{mainver}
+Release: %{fedorarel}%{?dist}
Summary: A mixed level/signal circuit simulator
License: BSD
URL: http://ngspice.sourceforge.net
-%if %{?devel}
-Source0: ngspice-rework-%{version}%{snap}.tar.bz2
-%else
+%if 0%{?userelease} >= 1
Source0: https://downloads.sourceforge.net/project/ngspice/ng-spice-rework/%{versi...
+%endif
+%if 0%{?usegitbare} >= 1
+Source0: ngspice-%{tarballdate}T%{tarballtime}.tar.gz
+%endif
Source1: https://downloads.sourceforge.net/project/ngspice/ng-spice-rework/%{versi...
Source2: https://downloads.sourceforge.net/project/ngspice/ng-spice-rework/%{versi...
-%endif
+Source10: create-ngspice-git-bare-tarball.sh
+
# Link libspice.so with -lBLT or -lBLIlite, depending on whether in tk mode or
# not (bug 1047056, debian bug 737279)
Patch0: ngspice-26-blt-linkage-workaround.patch
+Patch11: ngspice-32-gcc10-nocommon.patch
BuildRequires: gcc
@@ -49,18 +70,23 @@ BuildRequires: libICE-devel
BuildRequires: libXaw-devel
BuildRequires: libGL-devel
BuildRequires: libXt-devel
+# From ngspice 32
+BuildRequires: fontconfig-devel
+BuildRequires: freetype-devel
+BuildRequires: libXft-devel
+BuildRequires: libXrender-devel
BuildRequires: automake
BuildRequires: libtool
-%if %{?devel}
-BuildRequires: lyx
-%endif
BuildRequires: bison
BuildRequires: byacc
BuildRequires: flex
+
BuildRequires: ImageMagick
BuildRequires: mot-adms
+BuildRequires: git
+
Obsoletes: ngspice-doc < 20-4.cvs20100619
Provides: ngspice-doc = %{version}-%{release}
@@ -114,13 +140,31 @@ developing applications that use libngspice.
%prep
-%if %{?devel}
-%setup -q -n ngspice
-cd ng-spice-rework
-%else
-%setup -q -a 2
+%if 0%{?userelease} >= 1
+%setup -q
+git init
+git config user.name "%{name} maintainer"
+git config user.email "%{name}-owner(a)fedoraproject.org"
+git add .
+git commit -m "base" -a
+%endif
+
+%if 0%{?usegitbare} >= 1
+%setup -q -c -T -a 0
+git clone ./%{name}.git/
+cd %{name}
+git config user.name "%{name} maintainer"
+git config user.email "%{name}-owner(a)fedoraproject.org"
+
+git checkout -b %{name}-%{version}-fedora %{gitcommit}
%endif
+
+cat %{SOURCE2} | gzip -dc | tar xof -
+
%patch0 -p2 -b .link
+git commit -m "Link libspice.so with -lBLT or -lBLIlite, depending on whether in tk mode or not" -a
+%patch11 -p1 -b .nocommon
+git commit -m "Fix for gcc10 -fno-common" -a
# make sure the examples are UTF-8...
for nonUTF8 in \
@@ -133,6 +177,7 @@ do
%{_bindir}/iconv -f ISO-8859-1 -t utf-8 $nonUTF8 > $nonUTF8.conv
%{__mv} -f $nonUTF8.conv $nonUTF8
done
+git commit -m "Change files to UTF8" -a
# rpmlint warnings
find examples/ -type f -name ".cvsignore" -exec rm -rf {} ';'
@@ -140,11 +185,7 @@ find src/ -type f -name "*.c" -exec chmod -x {} ';'
find src/ -type f -name "*.h" -exec chmod -x {} ';'
find src/ -type f -name "*.l" -exec chmod -x {} ';'
find src/ -type f -name "*.y" -exec chmod -x {} ';'
-
-%ifarch x86_64 sparc64 ppc64 amd64
-sed -i "s|@XSPICEINIT@ codemodel @prefix@/@libname@|@XSPICEINIT@ codemodel %{_libdir}|" \
- src/spinit.in
-%endif
+git commit -m "Fix permission" -a || :
# Fix Tclspice's examples
sed -i \
@@ -156,26 +197,23 @@ sed -i \
sed -i \
's|spice::codemodel ../../src/xspice/icm/spice2poly|spice::codemodel %{_libdir}/tclspice/spice2poly|' \
examples/tclspice/tcl-testbench*/tcl-testbench*.sh
+git commit -m "Fix Tclspice's examples" -a
# Fixed minor CVS build
sed -i \
"s|AM_CPPFLAGS =|AM_CPPFLAGS = -I\$(top_srcdir)/src/maths/ni |" \
src/spicelib/analysis/Makefile.am
+git commit -m "Fix include path" -a
export ACLOCAL_FLAGS=-Im4
./autogen.sh --adms
+git commit -m "Execute autogen" -a || :
chmod +x configure
%build
-%if %{?devel}
-# ---- Manual ----------------------------------------------------------------
-cd ng-spice-manuals
-autoreconf -Wno-portability --install
-%configure ; make
-cd ..
-
-cd ng-spice-rework
+%if 0%{?usegitbare} >= 1
+cd %{name}
%endif
# ---- Tclspice ----------------------------------------------------------------
@@ -191,12 +229,6 @@ cd tclspice
sed -i \
's|\#define NGSPICEDATADIR "\`echo \$dprefix/share/ngspice\`"|\#define NGSPICEDATADIR "\`echo %{_libdir}/tclspice\`"|' \
configure*
-# fix ng-spice-manuals directory location
-%if %{?devel}
-sed -i \
- 's|../ng-spice-manuals|../../ng-spice-manuals|g' \
- manual/Makefile.am
-%endif
# direct access to Tcl_Interp->result deprecated in tcl8.6,
# remaining usage cannot be replaced by Tcl_SetResult
@@ -227,7 +259,7 @@ export CPPFLAGS=-DUSE_INTERP_RESULT
--enable-oldapps \
%{nil}
-%{__make}
+%{__make} -k
# Once install to the temp dir
rm -rf $(pwd)/../INST-TCLSPICE
%{__make} INSTALL="install -p" install DESTDIR=$(pwd)/../INST-TCLSPICE
@@ -257,8 +289,8 @@ do
%{nil}
%{__make} clean
-%{__make}
-# %{?_smp_mflags}
+# No parallel make
+%{__make} -k
# Once install to the temp dir
rm -rf $(pwd)/INST-NGSPICE-${opt}
%{__make} INSTALL="install -p" install DESTDIR=$(pwd)/INST-NGSPICE-${opt}
@@ -267,8 +299,9 @@ find $(pwd)/INST-NGSPICE-${opt} -type f | sort
done
%install
-%if %{?devel}
-cd ng-spice-rework
+%if 0%{?usegitbare} >= 1
+cp -p %{name}/COPYING .
+cd %{name}
%endif
# ---- Tclspice ----------------------------------------------------------------
@@ -279,7 +312,10 @@ rm -rf ./%{_datadir}/ngspice/include/
# see bug 1311869
rm -f ./%{_datadir}/ngspice/scripts/spinit
# binary differ
-mv .%{_bindir}/cmpp{,-tclspice}
+# for --short-circuit
+if [ -f .%{_bindir}/cmpp ] ; then
+ mv .%{_bindir}/cmpp{,-tclspice}
+fi
popd
# Install
@@ -307,11 +343,7 @@ cp -pr ./src/spicelib/devices/adms/ %{buildroot}%{_datadir}/%{name}
# Ensuring that all docs are under %%{_pkgdocdir}
mkdir -p %{buildroot}%{_pkgdocdir}
cp -pr examples/ %{buildroot}%{_pkgdocdir}
-%if %{?devel}
-cp -p ../ng-spice-manuals/manual.pdf %{buildroot}%{_pkgdocdir}/%{name}-%{version}.pdf
-%else
install -cpm 0644 %{SOURCE1} %{buildroot}%{_pkgdocdir}/%{name}-%{version}.pdf
-%endif
cp -a \
Stuarts_Poly_Notes \
@@ -332,11 +364,10 @@ chmod +x %{buildroot}%{_libdir}/ngspice/*.cm
chmod +x %{buildroot}%{_libdir}/tclspice/ngspice/*.cm
%check
-%if %{?devel}
-cd ng-spice-rework/tests
-%else
-cd tests
+%if 0%{?usegitbare} >= 1
+cd %{name}
%endif
+cd tests
#make check
%files
@@ -368,6 +399,10 @@ cd tests
%{_includedir}/ngspice/
%changelog
+* Tue May 5 2020 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 32-1.D20200405gitbbe81ca
+- Update to 32
+- Use upstream git to use some upstream fixes since release
+
* Wed Jan 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 31-4.respin2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
diff --git a/sources b/sources
index aeffb6c..7a5916f 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (ngspice-31.tar.gz) = 95d61fe4acdba8b4d8c22eeb2cff5e49976d324e93fdcf6b88b73d59a679bc9a6e7d2b39c3523dface52a2653533830c627259be8171794f1f363a573add1cef
+SHA512 (ngspice-20200505T2059.tar.gz) = f3c10dd1afb9df4b3a7af2f4712b22fdeb7e29224ac48f00c817e606a32452c9c46fb63981182675894f8fbc9154d0e1d1bb77f3946620091547504e082b7618
+SHA512 (ngspice-32-manual.pdf) = 1e4902bda97e8d26b0e38a6ce4e0fc25af7ae505308cba88da281323229a0cd39907581373e9fc59140ce9a0259a8411bb581d8cae94f18eb74283e774a9b93f
SHA512 (ng_adms_va.tar.gz) = fc47f1f1c73ec72b0e36d1b03869ddec64ea8777d404c059f362a4a7bdad164a3267a7b022fc6ddf8d3c5a0188493b1586754dfcb7cd39e42a2733a9f2a9dac6
-SHA512 (ngspice-31-manual.pdf) = 3322df92791718979a275f2640f82c3417f394a76d27ebf06b46f29a40a1ee3ef57c65a75a7ba67e697b55bd435f81e9ee61c78532f991a2dd6844b4f325eb55
4 years
Architecture specific change in rpms/kf5-kalarmcal.git
by githook-noreply@fedoraproject.org
The package rpms/kf5-kalarmcal.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/kf5-kalarmcal.git/commit/?id=fcb8....
Change:
+ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
Thanks.
Full change:
============
commit fcb8ddcebc2dd11e1fda33ed76c637c068c11ffd
Author: Troy Dawson <tdawson(a)redhat.com>
Date: Tue May 5 07:19:28 2020 -0700
libical now in aarch64 for RHEL8
diff --git a/kf5-kalarmcal.spec b/kf5-kalarmcal.spec
index e453449..53b4b22 100644
--- a/kf5-kalarmcal.spec
+++ b/kf5-kalarmcal.spec
@@ -25,7 +25,7 @@ Source0: http://download.kde.org/%{stable}/release-service/%{version}/src
# libical (and thus kcalendarcore) not on all arches for RHEL8.
%if 0%{?rhel} == 8
-ExclusiveArch: x86_64 ppc64le %{arm}
+ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
%endif
BuildRequires: extra-cmake-modules
4 years
Architecture specific change in rpms/kf5-ktnef.git
by githook-noreply@fedoraproject.org
The package rpms/kf5-ktnef.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/kf5-ktnef.git/commit/?id=923939df....
Change:
+ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
Thanks.
Full change:
============
commit 923939df3c389f3ec54553d259f4b86dd96c651d
Author: Troy Dawson <tdawson(a)redhat.com>
Date: Tue May 5 07:28:04 2020 -0700
libical now in aarch64 for RHEL8
diff --git a/kf5-ktnef.spec b/kf5-ktnef.spec
index af77bbb..f6c4de5 100644
--- a/kf5-ktnef.spec
+++ b/kf5-ktnef.spec
@@ -25,7 +25,7 @@ Source0: http://download.kde.org/%{stable}/release-service/%{version}/src
# libical (and thus kcalendarcore) not on all arches for RHEL8.
%if 0%{?rhel} == 8
-ExclusiveArch: x86_64 ppc64le %{arm}
+ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
%endif
BuildRequires: extra-cmake-modules
4 years