mtasaka pushed to rpms/ngspice (f37). "update to ngspice 39"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-02-01 02:06:08 UTC
From 1a4538ea935eb250c005caea9851c4e4a558a741 Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka(a)fedoraproject.org>
Date: Jan 31 2023 14:27:01 +0000
Subject: update to ngspice 39
---
diff --git a/ngspice.spec b/ngspice.spec
index c6ad3af..de0fcaf 100644
--- a/ngspice.spec
+++ b/ngspice.spec
@@ -5,20 +5,20 @@
# - Provides tclspice capabilities
# Chitlesh Goorah
-%global userelease 0
-%global usegitbare 1
+%global userelease 1
+%global usegitbare 0
%if 0%{?usegitbare} < 1
# force
%global userelease 1
%endif
-%global mainver 38
-%global docver 38
+%global mainver 39
+%global docver 39
%undefine prever
%global prerpmver %(echo "%{?prever}" | sed -e 's|-||g')
-%global mainrel 1.2
+%global mainrel 0.1
%if 0%{?usegitbare} >= 1
%global gitcommit 4bcd4daf559e70f268b5540bdf6afdf38e458e13
@@ -191,7 +191,7 @@ popd
%patch0 -p2 -b .link
git commit -m "Link libspice.so with -lBLT or -lBLIlite, depending on whether in tk mode or not" -a
-cat %PATCH10 | git am
+#cat %%PATCH10 | git am
# make sure the examples are UTF-8...
for nonUTF8 in \
@@ -454,6 +454,9 @@ popd
%{_includedir}/ngspice/
%changelog
+* Wed Feb 1 2023 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 39-1
+- Update to 39
+
* Sat Oct 29 2022 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 38-1
- Update to 38
diff --git a/sources b/sources
index 3cb6951..3649a31 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (ngspice-20221231T2138.tar.gz) = 49f49c0b5ab47b83ec87fa503f3c3613bb45cc185ad6b033ea41e8eb9a906c8329553228a2dabccc351a6984f661eb9be2de84cd4953dafb906f96ad9cc17f0a
-SHA512 (ngspice-38-manual.pdf) = 6a871636418a7a4c9695b7aa8319539b8d23e9d7a7ab9bf34bd9d14db9af88b8750231ac29e2aee9df7d0efc8c848aead3fdd69159f1ac0035f387df0dd32507
+SHA512 (ngspice-39.tar.gz) = e09f20fc410fee987dc2108d9f10a536eb1a4f576a6c0d3c9e3c58fcf733213a1c71711185bb2f84a02301f65cb993e319478c2509b5e61d29f6c42ffbf40309
+SHA512 (ngspice-39-manual.pdf) = 3e7b9dc8bebb0affd0fa30cfbd31776bfd564a472ccd2f8e09fb265b37d34e4be95a6dd41ea2ff565c973bb30b2fa5115ff6c894e84c290193faf3e4b772c95a
SHA512 (ngspice-adms-va.7z) = e0bab0a275ad781ee29d2ac982075079af1d9a2d0acc7f901783cb873e1a471b2aa62c08e51448ef2e4e57623ba2e4ae3549eb882e2c625c20b8141b8109b26a
https://src.fedoraproject.org/rpms/ngspice/c/1a4538ea935eb250c005caea9851...
1Â year, 3Â months
mtasaka pushed to rpms/ngspice (f37). "merge"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-02-01 02:06:08 UTC
From 6d27e5bfb9e5d2ae0f396833b05edf5a8fd225d4 Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka(a)fedoraproject.org>
Date: Feb 01 2023 02:05:08 +0000
Subject: merge
---
diff --git a/0001-osdi-fix-wrong-usage-of-max_align_t.patch b/0001-osdi-fix-wrong-usage-of-max_align_t.patch
new file mode 100644
index 0000000..9588390
--- /dev/null
+++ b/0001-osdi-fix-wrong-usage-of-max_align_t.patch
@@ -0,0 +1,38 @@
+From 24abf9df6f2f817823fa4fd8bffd21d2a1a38b8a Mon Sep 17 00:00:00 2001
+From: ngspice maintainer <ngspice-owner(a)fedoraproject.org>
+Date: Tue, 3 Jan 2023 18:36:44 +0900
+Subject: [PATCH] osdi: fix wrong usage of max_align_t
+
+max_align_t is used to examine the largest alignment requirement,
+and it is expected to check the alignment value via alignof, not sizeof.
+
+Otherwise, __attribute__((aligned)) can complain as required alignment
+being invalid, e.g. on s390x.
+---
+ src/osdi/osdidefs.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/osdi/osdidefs.h b/src/osdi/osdidefs.h
+index 45d117336..3deabbd22 100644
+--- a/src/osdi/osdidefs.h
++++ b/src/osdi/osdidefs.h
+@@ -25,6 +25,7 @@
+
+ #include <stddef.h>
+ #include <stdint.h>
++#include <stdalign.h>
+
+ #ifdef _MSC_VER
+ typedef struct {
+@@ -44,7 +45,7 @@ typedef struct {
+ #ifdef _MSC_VER
+ #define MAX_ALIGN 8
+ #else
+-#define MAX_ALIGN sizeof(max_align_t)
++#define MAX_ALIGN alignof(max_align_t)
+ #endif
+
+
+--
+2.39.0
+
diff --git a/ngspice.spec b/ngspice.spec
index 208f8cc..b9caa71 100644
--- a/ngspice.spec
+++ b/ngspice.spec
@@ -13,20 +13,20 @@
%global userelease 1
%endif
-%global mainver 38
-%global docver 38
+%global mainver 39
+%global docver 39
%undefine prever
%global prerpmver %(echo "%{?prever}" | sed -e 's|-||g')
%global mainrel 1
%if 0%{?usegitbare} >= 1
-%global gitcommit c8ac00e87a524b756f0548cfbb249bcf79c5ec79
-%global gitdate 20221028
+%global gitcommit 4bcd4daf559e70f268b5540bdf6afdf38e458e13
+%global gitdate 20221227
%global shortcommit %(c=%{gitcommit}; echo ${c:0:7})
-%global tarballdate 20221029
-%global tarballtime 2236
+%global tarballdate 20221231
+%global tarballtime 2138
%endif
%if 0%{?userelease} >= 1
@@ -61,6 +61,7 @@ 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-37-blt-linkage-workaround.patch
+Patch10: 0001-osdi-fix-wrong-usage-of-max_align_t.patch
BuildRequires: make
BuildRequires: gcc
@@ -190,6 +191,7 @@ popd
%patch0 -p2 -b .link
git commit -m "Link libspice.so with -lBLT or -lBLIlite, depending on whether in tk mode or not" -a
+cat %PATCH10 | git am
# make sure the examples are UTF-8...
for nonUTF8 in \
@@ -275,6 +277,7 @@ export CPPFLAGS=-DUSE_INTERP_RESULT
--disable-silent-rules \
--enable-adms \
--enable-xspice \
+ --enable-osdi \
--enable-maintainer-mode \
--enable-dependency-tracking \
--enable-cider \
@@ -313,6 +316,7 @@ do
${SHARED_OPT} \
--enable-adms \
--enable-xspice \
+ --enable-osdi \
--enable-maintainer-mode \
--enable-dependency-tracking \
--enable-cider \
@@ -450,6 +454,9 @@ popd
%{_includedir}/ngspice/
%changelog
+* Wed Feb 1 2023 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 39-1
+- Update to 39
+
* Thu Jan 19 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 38-1.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
diff --git a/sources b/sources
index 9823660..3649a31 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (ngspice-38.tar.gz) = 66490b251671eceda8ea0a7e216a08d90c7afa3828972d32fb1f6dbeb3223dc2e57584b1fc7f4c9e51fe385019b29b0942a30c1d87e90b004d7d932515ea9c3b
-SHA512 (ngspice-38-manual.pdf) = 6a871636418a7a4c9695b7aa8319539b8d23e9d7a7ab9bf34bd9d14db9af88b8750231ac29e2aee9df7d0efc8c848aead3fdd69159f1ac0035f387df0dd32507
+SHA512 (ngspice-39.tar.gz) = e09f20fc410fee987dc2108d9f10a536eb1a4f576a6c0d3c9e3c58fcf733213a1c71711185bb2f84a02301f65cb993e319478c2509b5e61d29f6c42ffbf40309
+SHA512 (ngspice-39-manual.pdf) = 3e7b9dc8bebb0affd0fa30cfbd31776bfd564a472ccd2f8e09fb265b37d34e4be95a6dd41ea2ff565c973bb30b2fa5115ff6c894e84c290193faf3e4b772c95a
SHA512 (ngspice-adms-va.7z) = e0bab0a275ad781ee29d2ac982075079af1d9a2d0acc7f901783cb873e1a471b2aa62c08e51448ef2e4e57623ba2e4ae3549eb882e2c625c20b8141b8109b26a
https://src.fedoraproject.org/rpms/ngspice/c/6d27e5bfb9e5d2ae0f396833b05e...
1Â year, 3Â months
mtasaka pushed to rpms/ngspice (f37). "enable osdi"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-02-01 02:06:08 UTC
From 6a0854517f2169c2f4524174e7d20bc89838da58 Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka(a)fedoraproject.org>
Date: Jan 01 2023 12:52:33 +0000
Subject: enable osdi
---
diff --git a/ngspice.spec b/ngspice.spec
index ee58da9..65e41d2 100644
--- a/ngspice.spec
+++ b/ngspice.spec
@@ -275,6 +275,7 @@ export CPPFLAGS=-DUSE_INTERP_RESULT
--disable-silent-rules \
--enable-adms \
--enable-xspice \
+ --enable-osdi \
--enable-maintainer-mode \
--enable-dependency-tracking \
--enable-cider \
@@ -313,6 +314,7 @@ do
${SHARED_OPT} \
--enable-adms \
--enable-xspice \
+ --enable-osdi \
--enable-maintainer-mode \
--enable-dependency-tracking \
--enable-cider \
https://src.fedoraproject.org/rpms/ngspice/c/6a0854517f2169c2f4524174e7d2...
1Â year, 3Â months
mtasaka pushed to rpms/ngspice (f37). "fix patch"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-02-01 02:06:08 UTC
From a69a5104311996ef5f8e0237a5158da6e431c9de Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka(a)fedoraproject.org>
Date: Jan 03 2023 09:37:06 +0000
Subject: fix patch
---
diff --git a/0001-osdi-fix-wrong-usage-of-max_align_t.patch b/0001-osdi-fix-wrong-usage-of-max_align_t.patch
index e8dc194..9588390 100644
--- a/0001-osdi-fix-wrong-usage-of-max_align_t.patch
+++ b/0001-osdi-fix-wrong-usage-of-max_align_t.patch
@@ -1,6 +1,6 @@
-From 410ffa0ec495ff7b7eeac65f7dcb2a5e9e5d4626 Mon Sep 17 00:00:00 2001
+From 24abf9df6f2f817823fa4fd8bffd21d2a1a38b8a Mon Sep 17 00:00:00 2001
From: ngspice maintainer <ngspice-owner(a)fedoraproject.org>
-Date: Tue, 3 Jan 2023 18:13:07 +0900
+Date: Tue, 3 Jan 2023 18:36:44 +0900
Subject: [PATCH] osdi: fix wrong usage of max_align_t
max_align_t is used to examine the largest alignment requirement,
@@ -9,14 +9,22 @@ and it is expected to check the alignment value via alignof, not sizeof.
Otherwise, __attribute__((aligned)) can complain as required alignment
being invalid, e.g. on s390x.
---
- src/osdi/osdidefs.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ src/osdi/osdidefs.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/osdi/osdidefs.h b/src/osdi/osdidefs.h
-index 45d117336..ee57f3a18 100644
+index 45d117336..3deabbd22 100644
--- a/src/osdi/osdidefs.h
+++ b/src/osdi/osdidefs.h
-@@ -44,7 +44,7 @@ typedef struct {
+@@ -25,6 +25,7 @@
+
+ #include <stddef.h>
+ #include <stdint.h>
++#include <stdalign.h>
+
+ #ifdef _MSC_VER
+ typedef struct {
+@@ -44,7 +45,7 @@ typedef struct {
#ifdef _MSC_VER
#define MAX_ALIGN 8
#else
https://src.fedoraproject.org/rpms/ngspice/c/a69a5104311996ef5f8e0237a515...
1Â year, 3Â months
mtasaka pushed to rpms/ngspice (f37). "update to the latest git"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-02-01 02:06:08 UTC
From e1a02e16ae6adf677889b337194db923b4987c63 Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka(a)fedoraproject.org>
Date: Dec 31 2022 12:59:25 +0000
Subject: update to the latest git
---
diff --git a/ngspice.spec b/ngspice.spec
index dfc2f5d..ee58da9 100644
--- a/ngspice.spec
+++ b/ngspice.spec
@@ -5,8 +5,8 @@
# - Provides tclspice capabilities
# Chitlesh Goorah
-%global userelease 1
-%global usegitbare 0
+%global userelease 0
+%global usegitbare 1
%if 0%{?usegitbare} < 1
# force
@@ -18,15 +18,15 @@
%undefine prever
%global prerpmver %(echo "%{?prever}" | sed -e 's|-||g')
-%global mainrel 1
+%global mainrel 1.1
%if 0%{?usegitbare} >= 1
-%global gitcommit c8ac00e87a524b756f0548cfbb249bcf79c5ec79
-%global gitdate 20221028
+%global gitcommit 4bcd4daf559e70f268b5540bdf6afdf38e458e13
+%global gitdate 20221227
%global shortcommit %(c=%{gitcommit}; echo ${c:0:7})
-%global tarballdate 20221029
-%global tarballtime 2236
+%global tarballdate 20221231
+%global tarballtime 2138
%endif
%if 0%{?userelease} >= 1
diff --git a/sources b/sources
index 9823660..3cb6951 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (ngspice-38.tar.gz) = 66490b251671eceda8ea0a7e216a08d90c7afa3828972d32fb1f6dbeb3223dc2e57584b1fc7f4c9e51fe385019b29b0942a30c1d87e90b004d7d932515ea9c3b
+SHA512 (ngspice-20221231T2138.tar.gz) = 49f49c0b5ab47b83ec87fa503f3c3613bb45cc185ad6b033ea41e8eb9a906c8329553228a2dabccc351a6984f661eb9be2de84cd4953dafb906f96ad9cc17f0a
SHA512 (ngspice-38-manual.pdf) = 6a871636418a7a4c9695b7aa8319539b8d23e9d7a7ab9bf34bd9d14db9af88b8750231ac29e2aee9df7d0efc8c848aead3fdd69159f1ac0035f387df0dd32507
SHA512 (ngspice-adms-va.7z) = e0bab0a275ad781ee29d2ac982075079af1d9a2d0acc7f901783cb873e1a471b2aa62c08e51448ef2e4e57623ba2e4ae3549eb882e2c625c20b8141b8109b26a
https://src.fedoraproject.org/rpms/ngspice/c/e1a02e16ae6adf677889b337194d...
1Â year, 3Â months
mtasaka pushed to rpms/ngspice (f37). "add patch for max_align_t usage"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-02-01 02:06:08 UTC
From 827fc3c8eef4c6b01cddf97ce2d1d379601e4773 Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka(a)fedoraproject.org>
Date: Jan 03 2023 09:14:21 +0000
Subject: add patch for max_align_t usage
---
diff --git a/0001-osdi-fix-wrong-usage-of-max_align_t.patch b/0001-osdi-fix-wrong-usage-of-max_align_t.patch
new file mode 100644
index 0000000..e8dc194
--- /dev/null
+++ b/0001-osdi-fix-wrong-usage-of-max_align_t.patch
@@ -0,0 +1,30 @@
+From 410ffa0ec495ff7b7eeac65f7dcb2a5e9e5d4626 Mon Sep 17 00:00:00 2001
+From: ngspice maintainer <ngspice-owner(a)fedoraproject.org>
+Date: Tue, 3 Jan 2023 18:13:07 +0900
+Subject: [PATCH] osdi: fix wrong usage of max_align_t
+
+max_align_t is used to examine the largest alignment requirement,
+and it is expected to check the alignment value via alignof, not sizeof.
+
+Otherwise, __attribute__((aligned)) can complain as required alignment
+being invalid, e.g. on s390x.
+---
+ src/osdi/osdidefs.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/osdi/osdidefs.h b/src/osdi/osdidefs.h
+index 45d117336..ee57f3a18 100644
+--- a/src/osdi/osdidefs.h
++++ b/src/osdi/osdidefs.h
+@@ -44,7 +44,7 @@ typedef struct {
+ #ifdef _MSC_VER
+ #define MAX_ALIGN 8
+ #else
+-#define MAX_ALIGN sizeof(max_align_t)
++#define MAX_ALIGN alignof(max_align_t)
+ #endif
+
+
+--
+2.39.0
+
diff --git a/ngspice.spec b/ngspice.spec
index 65e41d2..c6ad3af 100644
--- a/ngspice.spec
+++ b/ngspice.spec
@@ -18,7 +18,7 @@
%undefine prever
%global prerpmver %(echo "%{?prever}" | sed -e 's|-||g')
-%global mainrel 1.1
+%global mainrel 1.2
%if 0%{?usegitbare} >= 1
%global gitcommit 4bcd4daf559e70f268b5540bdf6afdf38e458e13
@@ -61,6 +61,7 @@ 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-37-blt-linkage-workaround.patch
+Patch10: 0001-osdi-fix-wrong-usage-of-max_align_t.patch
BuildRequires: make
BuildRequires: gcc
@@ -190,6 +191,7 @@ popd
%patch0 -p2 -b .link
git commit -m "Link libspice.so with -lBLT or -lBLIlite, depending on whether in tk mode or not" -a
+cat %PATCH10 | git am
# make sure the examples are UTF-8...
for nonUTF8 in \
https://src.fedoraproject.org/rpms/ngspice/c/827fc3c8eef4c6b01cddf97ce2d1...
1Â year, 3Â months
mtasaka pushed to rpms/ngspice (rawhide). "update to ngspice 39"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-02-01 02:05:17 UTC
From 1a4538ea935eb250c005caea9851c4e4a558a741 Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka(a)fedoraproject.org>
Date: Jan 31 2023 14:27:01 +0000
Subject: update to ngspice 39
---
diff --git a/ngspice.spec b/ngspice.spec
index c6ad3af..de0fcaf 100644
--- a/ngspice.spec
+++ b/ngspice.spec
@@ -5,20 +5,20 @@
# - Provides tclspice capabilities
# Chitlesh Goorah
-%global userelease 0
-%global usegitbare 1
+%global userelease 1
+%global usegitbare 0
%if 0%{?usegitbare} < 1
# force
%global userelease 1
%endif
-%global mainver 38
-%global docver 38
+%global mainver 39
+%global docver 39
%undefine prever
%global prerpmver %(echo "%{?prever}" | sed -e 's|-||g')
-%global mainrel 1.2
+%global mainrel 0.1
%if 0%{?usegitbare} >= 1
%global gitcommit 4bcd4daf559e70f268b5540bdf6afdf38e458e13
@@ -191,7 +191,7 @@ popd
%patch0 -p2 -b .link
git commit -m "Link libspice.so with -lBLT or -lBLIlite, depending on whether in tk mode or not" -a
-cat %PATCH10 | git am
+#cat %%PATCH10 | git am
# make sure the examples are UTF-8...
for nonUTF8 in \
@@ -454,6 +454,9 @@ popd
%{_includedir}/ngspice/
%changelog
+* Wed Feb 1 2023 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 39-1
+- Update to 39
+
* Sat Oct 29 2022 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 38-1
- Update to 38
diff --git a/sources b/sources
index 3cb6951..3649a31 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (ngspice-20221231T2138.tar.gz) = 49f49c0b5ab47b83ec87fa503f3c3613bb45cc185ad6b033ea41e8eb9a906c8329553228a2dabccc351a6984f661eb9be2de84cd4953dafb906f96ad9cc17f0a
-SHA512 (ngspice-38-manual.pdf) = 6a871636418a7a4c9695b7aa8319539b8d23e9d7a7ab9bf34bd9d14db9af88b8750231ac29e2aee9df7d0efc8c848aead3fdd69159f1ac0035f387df0dd32507
+SHA512 (ngspice-39.tar.gz) = e09f20fc410fee987dc2108d9f10a536eb1a4f576a6c0d3c9e3c58fcf733213a1c71711185bb2f84a02301f65cb993e319478c2509b5e61d29f6c42ffbf40309
+SHA512 (ngspice-39-manual.pdf) = 3e7b9dc8bebb0affd0fa30cfbd31776bfd564a472ccd2f8e09fb265b37d34e4be95a6dd41ea2ff565c973bb30b2fa5115ff6c894e84c290193faf3e4b772c95a
SHA512 (ngspice-adms-va.7z) = e0bab0a275ad781ee29d2ac982075079af1d9a2d0acc7f901783cb873e1a471b2aa62c08e51448ef2e4e57623ba2e4ae3549eb882e2c625c20b8141b8109b26a
https://src.fedoraproject.org/rpms/ngspice/c/1a4538ea935eb250c005caea9851...
1Â year, 3Â months
mtasaka pushed to rpms/ngspice (rawhide). "merge"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-02-01 02:05:18 UTC
From 6d27e5bfb9e5d2ae0f396833b05edf5a8fd225d4 Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka(a)fedoraproject.org>
Date: Feb 01 2023 02:05:08 +0000
Subject: merge
---
diff --git a/0001-osdi-fix-wrong-usage-of-max_align_t.patch b/0001-osdi-fix-wrong-usage-of-max_align_t.patch
new file mode 100644
index 0000000..9588390
--- /dev/null
+++ b/0001-osdi-fix-wrong-usage-of-max_align_t.patch
@@ -0,0 +1,38 @@
+From 24abf9df6f2f817823fa4fd8bffd21d2a1a38b8a Mon Sep 17 00:00:00 2001
+From: ngspice maintainer <ngspice-owner(a)fedoraproject.org>
+Date: Tue, 3 Jan 2023 18:36:44 +0900
+Subject: [PATCH] osdi: fix wrong usage of max_align_t
+
+max_align_t is used to examine the largest alignment requirement,
+and it is expected to check the alignment value via alignof, not sizeof.
+
+Otherwise, __attribute__((aligned)) can complain as required alignment
+being invalid, e.g. on s390x.
+---
+ src/osdi/osdidefs.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/osdi/osdidefs.h b/src/osdi/osdidefs.h
+index 45d117336..3deabbd22 100644
+--- a/src/osdi/osdidefs.h
++++ b/src/osdi/osdidefs.h
+@@ -25,6 +25,7 @@
+
+ #include <stddef.h>
+ #include <stdint.h>
++#include <stdalign.h>
+
+ #ifdef _MSC_VER
+ typedef struct {
+@@ -44,7 +45,7 @@ typedef struct {
+ #ifdef _MSC_VER
+ #define MAX_ALIGN 8
+ #else
+-#define MAX_ALIGN sizeof(max_align_t)
++#define MAX_ALIGN alignof(max_align_t)
+ #endif
+
+
+--
+2.39.0
+
diff --git a/ngspice.spec b/ngspice.spec
index 208f8cc..b9caa71 100644
--- a/ngspice.spec
+++ b/ngspice.spec
@@ -13,20 +13,20 @@
%global userelease 1
%endif
-%global mainver 38
-%global docver 38
+%global mainver 39
+%global docver 39
%undefine prever
%global prerpmver %(echo "%{?prever}" | sed -e 's|-||g')
%global mainrel 1
%if 0%{?usegitbare} >= 1
-%global gitcommit c8ac00e87a524b756f0548cfbb249bcf79c5ec79
-%global gitdate 20221028
+%global gitcommit 4bcd4daf559e70f268b5540bdf6afdf38e458e13
+%global gitdate 20221227
%global shortcommit %(c=%{gitcommit}; echo ${c:0:7})
-%global tarballdate 20221029
-%global tarballtime 2236
+%global tarballdate 20221231
+%global tarballtime 2138
%endif
%if 0%{?userelease} >= 1
@@ -61,6 +61,7 @@ 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-37-blt-linkage-workaround.patch
+Patch10: 0001-osdi-fix-wrong-usage-of-max_align_t.patch
BuildRequires: make
BuildRequires: gcc
@@ -190,6 +191,7 @@ popd
%patch0 -p2 -b .link
git commit -m "Link libspice.so with -lBLT or -lBLIlite, depending on whether in tk mode or not" -a
+cat %PATCH10 | git am
# make sure the examples are UTF-8...
for nonUTF8 in \
@@ -275,6 +277,7 @@ export CPPFLAGS=-DUSE_INTERP_RESULT
--disable-silent-rules \
--enable-adms \
--enable-xspice \
+ --enable-osdi \
--enable-maintainer-mode \
--enable-dependency-tracking \
--enable-cider \
@@ -313,6 +316,7 @@ do
${SHARED_OPT} \
--enable-adms \
--enable-xspice \
+ --enable-osdi \
--enable-maintainer-mode \
--enable-dependency-tracking \
--enable-cider \
@@ -450,6 +454,9 @@ popd
%{_includedir}/ngspice/
%changelog
+* Wed Feb 1 2023 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 39-1
+- Update to 39
+
* Thu Jan 19 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 38-1.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
diff --git a/sources b/sources
index 9823660..3649a31 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (ngspice-38.tar.gz) = 66490b251671eceda8ea0a7e216a08d90c7afa3828972d32fb1f6dbeb3223dc2e57584b1fc7f4c9e51fe385019b29b0942a30c1d87e90b004d7d932515ea9c3b
-SHA512 (ngspice-38-manual.pdf) = 6a871636418a7a4c9695b7aa8319539b8d23e9d7a7ab9bf34bd9d14db9af88b8750231ac29e2aee9df7d0efc8c848aead3fdd69159f1ac0035f387df0dd32507
+SHA512 (ngspice-39.tar.gz) = e09f20fc410fee987dc2108d9f10a536eb1a4f576a6c0d3c9e3c58fcf733213a1c71711185bb2f84a02301f65cb993e319478c2509b5e61d29f6c42ffbf40309
+SHA512 (ngspice-39-manual.pdf) = 3e7b9dc8bebb0affd0fa30cfbd31776bfd564a472ccd2f8e09fb265b37d34e4be95a6dd41ea2ff565c973bb30b2fa5115ff6c894e84c290193faf3e4b772c95a
SHA512 (ngspice-adms-va.7z) = e0bab0a275ad781ee29d2ac982075079af1d9a2d0acc7f901783cb873e1a471b2aa62c08e51448ef2e4e57623ba2e4ae3549eb882e2c625c20b8141b8109b26a
https://src.fedoraproject.org/rpms/ngspice/c/6d27e5bfb9e5d2ae0f396833b05e...
1Â year, 3Â months
mtasaka pushed to rpms/ngspice (rawhide). "fix patch"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-02-01 02:05:17 UTC
From a69a5104311996ef5f8e0237a5158da6e431c9de Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka(a)fedoraproject.org>
Date: Jan 03 2023 09:37:06 +0000
Subject: fix patch
---
diff --git a/0001-osdi-fix-wrong-usage-of-max_align_t.patch b/0001-osdi-fix-wrong-usage-of-max_align_t.patch
index e8dc194..9588390 100644
--- a/0001-osdi-fix-wrong-usage-of-max_align_t.patch
+++ b/0001-osdi-fix-wrong-usage-of-max_align_t.patch
@@ -1,6 +1,6 @@
-From 410ffa0ec495ff7b7eeac65f7dcb2a5e9e5d4626 Mon Sep 17 00:00:00 2001
+From 24abf9df6f2f817823fa4fd8bffd21d2a1a38b8a Mon Sep 17 00:00:00 2001
From: ngspice maintainer <ngspice-owner(a)fedoraproject.org>
-Date: Tue, 3 Jan 2023 18:13:07 +0900
+Date: Tue, 3 Jan 2023 18:36:44 +0900
Subject: [PATCH] osdi: fix wrong usage of max_align_t
max_align_t is used to examine the largest alignment requirement,
@@ -9,14 +9,22 @@ and it is expected to check the alignment value via alignof, not sizeof.
Otherwise, __attribute__((aligned)) can complain as required alignment
being invalid, e.g. on s390x.
---
- src/osdi/osdidefs.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ src/osdi/osdidefs.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/osdi/osdidefs.h b/src/osdi/osdidefs.h
-index 45d117336..ee57f3a18 100644
+index 45d117336..3deabbd22 100644
--- a/src/osdi/osdidefs.h
+++ b/src/osdi/osdidefs.h
-@@ -44,7 +44,7 @@ typedef struct {
+@@ -25,6 +25,7 @@
+
+ #include <stddef.h>
+ #include <stdint.h>
++#include <stdalign.h>
+
+ #ifdef _MSC_VER
+ typedef struct {
+@@ -44,7 +45,7 @@ typedef struct {
#ifdef _MSC_VER
#define MAX_ALIGN 8
#else
https://src.fedoraproject.org/rpms/ngspice/c/a69a5104311996ef5f8e0237a515...
1Â year, 3Â months
mtasaka pushed to rpms/ngspice (rawhide). "enable osdi"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-02-01 02:05:17 UTC
From 6a0854517f2169c2f4524174e7d20bc89838da58 Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka(a)fedoraproject.org>
Date: Jan 01 2023 12:52:33 +0000
Subject: enable osdi
---
diff --git a/ngspice.spec b/ngspice.spec
index ee58da9..65e41d2 100644
--- a/ngspice.spec
+++ b/ngspice.spec
@@ -275,6 +275,7 @@ export CPPFLAGS=-DUSE_INTERP_RESULT
--disable-silent-rules \
--enable-adms \
--enable-xspice \
+ --enable-osdi \
--enable-maintainer-mode \
--enable-dependency-tracking \
--enable-cider \
@@ -313,6 +314,7 @@ do
${SHARED_OPT} \
--enable-adms \
--enable-xspice \
+ --enable-osdi \
--enable-maintainer-mode \
--enable-dependency-tracking \
--enable-cider \
https://src.fedoraproject.org/rpms/ngspice/c/6a0854517f2169c2f4524174e7d2...
1Â year, 3Â months