steved pushed to nfs-utils (f33). "nfsdcltrack: Use uint64_t instead
of time_t (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-07-31 16:04:11 UTC
From 7eb32340a7086c4575b39ec9af73ecfaf2e1dd0c Mon Sep 17 00:00:00 2001
From: Steve Dickson <steved(a)redhat.com>
Date: Jul 31 2021 15:40:58 +0000
Subject: nfsdcltrack: Use uint64_t instead of time_t
Signed-off-by: Steve Dickson <steved(a)redhat.com>
---
diff --git a/nfs-utils-2.5.4-nfsdcltrack-uint64_t.patch b/nfs-utils-2.5.4-nfsdcltrack-uint64_t.patch
new file mode 100644
index 0000000..cf5500a
--- /dev/null
+++ b/nfs-utils-2.5.4-nfsdcltrack-uint64_t.patch
@@ -0,0 +1,57 @@
+commit 71a09e1dbf6c988e17d18f36117a73127d199d20
+Author: Steve Dickson <steved(a)redhat.com>
+Date: Tue Jul 27 21:12:17 2021 -0400
+
+ nfsdcltrack: Use uint64_t instead of time_t
+
+ With recent commits (4f2a5b64,5a53426c) that fixed
+ compile errors on x86_64 machines, caused similar
+ errors on i686 machines.
+
+ The variable type that was being used was a time_t,
+ which changes size between architects, which
+ caused the compile error.
+
+ Changing the variable to uint64_t fixed the issue.
+
+ Signed-off-by: Steve Dickson <steved(a)redhat.com>
+
+diff --git a/utils/nfsdcltrack/nfsdcltrack.c b/utils/nfsdcltrack/nfsdcltrack.c
+index 0b37c094..7c1c4bcc 100644
+--- a/utils/nfsdcltrack/nfsdcltrack.c
++++ b/utils/nfsdcltrack/nfsdcltrack.c
+@@ -508,7 +508,7 @@ cltrack_gracedone(const char *timestr)
+ {
+ int ret;
+ char *tail;
+- time_t gracetime;
++ uint64_t gracetime;
+
+
+ ret = sqlite_prepare_dbh(storagedir);
+diff --git a/utils/nfsdcltrack/sqlite.c b/utils/nfsdcltrack/sqlite.c
+index cea4a411..cf0c6a45 100644
+--- a/utils/nfsdcltrack/sqlite.c
++++ b/utils/nfsdcltrack/sqlite.c
+@@ -540,7 +540,7 @@ out_err:
+ * remove any client records that were not reclaimed since grace_start.
+ */
+ int
+-sqlite_remove_unreclaimed(time_t grace_start)
++sqlite_remove_unreclaimed(uint64_t grace_start)
+ {
+ int ret;
+ char *err = NULL;
+diff --git a/utils/nfsdcltrack/sqlite.h b/utils/nfsdcltrack/sqlite.h
+index 06e7c044..ba8cdfa8 100644
+--- a/utils/nfsdcltrack/sqlite.h
++++ b/utils/nfsdcltrack/sqlite.h
+@@ -26,7 +26,7 @@ int sqlite_insert_client(const unsigned char *clname, const size_t namelen,
+ int sqlite_remove_client(const unsigned char *clname, const size_t namelen);
+ int sqlite_check_client(const unsigned char *clname, const size_t namelen,
+ const bool has_session);
+-int sqlite_remove_unreclaimed(const time_t grace_start);
++int sqlite_remove_unreclaimed(const uint64_t grace_start);
+ int sqlite_query_reclaiming(const time_t grace_start);
+
+ #endif /* _SQLITE_H */
diff --git a/nfs-utils.spec b/nfs-utils.spec
index 25b4fca..90be75f 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -2,7 +2,7 @@ Summary: NFS utilities and supporting clients and daemons for the kernel NFS ser
Name: nfs-utils
URL: http://linux-nfs.org/
Version: 2.5.4
-Release: 0.rc1%{?dist}
+Release: 1.rc1%{?dist}
Epoch: 1
# group all 32bit related archs
@@ -17,6 +17,7 @@ Source5: nfsconvert.sh
Source6: nfs-convert.service
Patch001: nfs-utils-2.5.5-rc1.patch
+Patch002: nfs-utils-2.5.4-nfsdcltrack-uint64_t.patch
Patch100: nfs-utils-1.2.1-statdpath-man.patch
Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch
@@ -365,6 +366,9 @@ fi
%{_pkgdir}/*/var-lib-nfs-rpc_pipefs.mount
%changelog
+* Sat Jul 31 2021 Steve Dickson <steved(a)redhat.com> 2.5.4-1.rc1
+- nfsdcltrack: Use uint64_t instead of time_t
+
* Mon Jul 26 2021 Steve Dickson <steved(a)redhat.com> 2.5.4-1.rc1
- Updated to the latest RC release: nfs-utils-2-5-5.rc1 (bz 1986121)
https://src.fedoraproject.org/rpms/nfs-utils/c/7eb32340a7086c4575b39ec9af...
2Â years, 10Â months
steved pushed to nfs-utils (f34). "nfsdcltrack: Use uint64_t instead
of time_t (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-07-31 16:03:47 UTC
From fdbaff19ac263f931935396fc60ccaca0105c130 Mon Sep 17 00:00:00 2001
From: Steve Dickson <steved(a)redhat.com>
Date: Jul 31 2021 15:43:03 +0000
Subject: nfsdcltrack: Use uint64_t instead of time_t
Signed-off-by: Steve Dickson <steved(a)redhat.com>
---
diff --git a/nfs-utils-2.5.4-nfsdcltrack-uint64_t.patch b/nfs-utils-2.5.4-nfsdcltrack-uint64_t.patch
new file mode 100644
index 0000000..cf5500a
--- /dev/null
+++ b/nfs-utils-2.5.4-nfsdcltrack-uint64_t.patch
@@ -0,0 +1,57 @@
+commit 71a09e1dbf6c988e17d18f36117a73127d199d20
+Author: Steve Dickson <steved(a)redhat.com>
+Date: Tue Jul 27 21:12:17 2021 -0400
+
+ nfsdcltrack: Use uint64_t instead of time_t
+
+ With recent commits (4f2a5b64,5a53426c) that fixed
+ compile errors on x86_64 machines, caused similar
+ errors on i686 machines.
+
+ The variable type that was being used was a time_t,
+ which changes size between architects, which
+ caused the compile error.
+
+ Changing the variable to uint64_t fixed the issue.
+
+ Signed-off-by: Steve Dickson <steved(a)redhat.com>
+
+diff --git a/utils/nfsdcltrack/nfsdcltrack.c b/utils/nfsdcltrack/nfsdcltrack.c
+index 0b37c094..7c1c4bcc 100644
+--- a/utils/nfsdcltrack/nfsdcltrack.c
++++ b/utils/nfsdcltrack/nfsdcltrack.c
+@@ -508,7 +508,7 @@ cltrack_gracedone(const char *timestr)
+ {
+ int ret;
+ char *tail;
+- time_t gracetime;
++ uint64_t gracetime;
+
+
+ ret = sqlite_prepare_dbh(storagedir);
+diff --git a/utils/nfsdcltrack/sqlite.c b/utils/nfsdcltrack/sqlite.c
+index cea4a411..cf0c6a45 100644
+--- a/utils/nfsdcltrack/sqlite.c
++++ b/utils/nfsdcltrack/sqlite.c
+@@ -540,7 +540,7 @@ out_err:
+ * remove any client records that were not reclaimed since grace_start.
+ */
+ int
+-sqlite_remove_unreclaimed(time_t grace_start)
++sqlite_remove_unreclaimed(uint64_t grace_start)
+ {
+ int ret;
+ char *err = NULL;
+diff --git a/utils/nfsdcltrack/sqlite.h b/utils/nfsdcltrack/sqlite.h
+index 06e7c044..ba8cdfa8 100644
+--- a/utils/nfsdcltrack/sqlite.h
++++ b/utils/nfsdcltrack/sqlite.h
+@@ -26,7 +26,7 @@ int sqlite_insert_client(const unsigned char *clname, const size_t namelen,
+ int sqlite_remove_client(const unsigned char *clname, const size_t namelen);
+ int sqlite_check_client(const unsigned char *clname, const size_t namelen,
+ const bool has_session);
+-int sqlite_remove_unreclaimed(const time_t grace_start);
++int sqlite_remove_unreclaimed(const uint64_t grace_start);
+ int sqlite_query_reclaiming(const time_t grace_start);
+
+ #endif /* _SQLITE_H */
diff --git a/nfs-utils.spec b/nfs-utils.spec
index cbaeac2..cace4b6 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -2,7 +2,7 @@ Summary: NFS utilities and supporting clients and daemons for the kernel NFS ser
Name: nfs-utils
URL: http://linux-nfs.org/
Version: 2.5.4
-Release: 0.rc1%{?dist}
+Release: 1.rc1%{?dist}
Epoch: 1
# group all 32bit related archs
@@ -18,6 +18,7 @@ Source6: nfs-convert.service
Source7: 10-nfsv4.conf
Patch001: nfs-utils-2.5.5-rc1.patch
+Patch002: nfs-utils-2.5.4-nfsdcltrack-uint64_t.patch
Patch100: nfs-utils-1.2.1-statdpath-man.patch
Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch
@@ -453,6 +454,9 @@ fi
%{_mandir}/*/nfsiostat.8.gz
%changelog
+* Sat Jul 31 2021 Steve Dickson <steved(a)redhat.com> 2.5.4-1.rc1
+- nfsdcltrack: Use uint64_t instead of time_t
+
* Mon Jul 26 2021 Steve Dickson <steved(a)redhat.com> 2.5.4-1.rc1
- Updated to the latest RC release: nfs-utils-2-5-5.rc1 (bz 1986121)
https://src.fedoraproject.org/rpms/nfs-utils/c/fdbaff19ac263f931935396fc6...
2Â years, 10Â months
steved pushed to nfs-utils (rawhide). "nfsdcltrack: Use uint64_t
instead of time_t (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-07-31 16:03:24 UTC
From 8dacf9facdb4066e0b929d28fec3836616c5c461 Mon Sep 17 00:00:00 2001
From: Steve Dickson <steved(a)redhat.com>
Date: Jul 31 2021 15:37:42 +0000
Subject: nfsdcltrack: Use uint64_t instead of time_t
Signed-off-by: Steve Dickson <steved(a)redhat.com>
---
diff --git a/nfs-utils-2.5.4-nfsdcltrack-uint64_t.patch b/nfs-utils-2.5.4-nfsdcltrack-uint64_t.patch
new file mode 100644
index 0000000..cf5500a
--- /dev/null
+++ b/nfs-utils-2.5.4-nfsdcltrack-uint64_t.patch
@@ -0,0 +1,57 @@
+commit 71a09e1dbf6c988e17d18f36117a73127d199d20
+Author: Steve Dickson <steved(a)redhat.com>
+Date: Tue Jul 27 21:12:17 2021 -0400
+
+ nfsdcltrack: Use uint64_t instead of time_t
+
+ With recent commits (4f2a5b64,5a53426c) that fixed
+ compile errors on x86_64 machines, caused similar
+ errors on i686 machines.
+
+ The variable type that was being used was a time_t,
+ which changes size between architects, which
+ caused the compile error.
+
+ Changing the variable to uint64_t fixed the issue.
+
+ Signed-off-by: Steve Dickson <steved(a)redhat.com>
+
+diff --git a/utils/nfsdcltrack/nfsdcltrack.c b/utils/nfsdcltrack/nfsdcltrack.c
+index 0b37c094..7c1c4bcc 100644
+--- a/utils/nfsdcltrack/nfsdcltrack.c
++++ b/utils/nfsdcltrack/nfsdcltrack.c
+@@ -508,7 +508,7 @@ cltrack_gracedone(const char *timestr)
+ {
+ int ret;
+ char *tail;
+- time_t gracetime;
++ uint64_t gracetime;
+
+
+ ret = sqlite_prepare_dbh(storagedir);
+diff --git a/utils/nfsdcltrack/sqlite.c b/utils/nfsdcltrack/sqlite.c
+index cea4a411..cf0c6a45 100644
+--- a/utils/nfsdcltrack/sqlite.c
++++ b/utils/nfsdcltrack/sqlite.c
+@@ -540,7 +540,7 @@ out_err:
+ * remove any client records that were not reclaimed since grace_start.
+ */
+ int
+-sqlite_remove_unreclaimed(time_t grace_start)
++sqlite_remove_unreclaimed(uint64_t grace_start)
+ {
+ int ret;
+ char *err = NULL;
+diff --git a/utils/nfsdcltrack/sqlite.h b/utils/nfsdcltrack/sqlite.h
+index 06e7c044..ba8cdfa8 100644
+--- a/utils/nfsdcltrack/sqlite.h
++++ b/utils/nfsdcltrack/sqlite.h
+@@ -26,7 +26,7 @@ int sqlite_insert_client(const unsigned char *clname, const size_t namelen,
+ int sqlite_remove_client(const unsigned char *clname, const size_t namelen);
+ int sqlite_check_client(const unsigned char *clname, const size_t namelen,
+ const bool has_session);
+-int sqlite_remove_unreclaimed(const time_t grace_start);
++int sqlite_remove_unreclaimed(const uint64_t grace_start);
+ int sqlite_query_reclaiming(const time_t grace_start);
+
+ #endif /* _SQLITE_H */
diff --git a/nfs-utils.spec b/nfs-utils.spec
index 387a42f..d7a0223 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -2,7 +2,7 @@ Summary: NFS utilities and supporting clients and daemons for the kernel NFS ser
Name: nfs-utils
URL: http://linux-nfs.org/
Version: 2.5.4
-Release: 1.rc1%{?dist}
+Release: 2.rc1%{?dist}
Epoch: 1
# group all 32bit related archs
@@ -18,6 +18,7 @@ Source6: nfs-convert.service
Source7: 10-nfsv4.conf
Patch001: nfs-utils-2.5.5-rc1.patch
+Patch002: nfs-utils-2.5.4-nfsdcltrack-uint64_t.patch
Patch100: nfs-utils-1.2.1-statdpath-man.patch
Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch
@@ -453,6 +454,9 @@ fi
%{_mandir}/*/nfsiostat.8.gz
%changelog
+* Sat Jul 31 2021 Steve Dickson <steved(a)redhat.com> 2.5.4-2.rc1
+- nfsdcltrack: Use uint64_t instead of time_t
+
* Mon Jul 26 2021 Steve Dickson <steved(a)redhat.com> 2.5.4-1.rc1
- Updated to the latest RC release: nfs-utils-2-5-5.rc1 (bz 1986121)
https://src.fedoraproject.org/rpms/nfs-utils/c/8dacf9facdb4066e0b929d28fe...
2Â years, 10Â months
hobbes1069 pushed to gmic (rawhide). "Rebuild with OpenEXR/Imath 3."
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-07-31 15:54:50 UTC
From 80dc95d4ac2fd201978dc2509b380fb2efd306be Mon Sep 17 00:00:00 2001
From: Richard Shaw <hobbes1069(a)gmail.com>
Date: Jul 31 2021 15:54:44 +0000
Subject: Rebuild with OpenEXR/Imath 3.
---
diff --git a/gmic-openexr3.patch b/gmic-openexr3.patch
new file mode 100644
index 0000000..7b8c138
--- /dev/null
+++ b/gmic-openexr3.patch
@@ -0,0 +1,31 @@
+Index: gmic-2.9.7/cmake/FindCImg.cmake
+===================================================================
+--- gmic-2.9.7.orig/cmake/FindCImg.cmake
++++ gmic-2.9.7/cmake/FindCImg.cmake
+@@ -147,7 +147,10 @@ if(ENABLE_JPEG)
+ endif()
+
+ if(ENABLE_OPENEXR)
+- find_package(OpenEXR)
++ find_package(OpenEXR CONFIG)
++ if(NOT TARGET OpenEXR::OpenEXR)
++ find_package(OpenEXR)
++ endif()
+
+ if(OpenEXR_FOUND)
+ list(APPEND CLI_COMPILE_FLAGS "cimg_use_openexr")
+Index: gmic-2.9.7/src/Makefile
+===================================================================
+--- gmic-2.9.7.orig/src/Makefile
++++ gmic-2.9.7/src/Makefile
+@@ -308,8 +308,8 @@ MAGICK_LIBS = $(shell pkg-config --libs
+
+ # Enable native support of EXR image files, using the OpenEXR library.
+ # (http://www.openexr.com/)
+-OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR
+-OPENEXR_LIBS = -lIlmImf -lHalf
++OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR -I$(USR)/$(INCLUDE)/Imath
++OPENEXR_LIBS = -lOpenEXR -lImath
+
+ # Enable Fast Fourier Transforms, using the FFTW3 library.
+ # (http://www.fftw.org/)
diff --git a/gmic.spec b/gmic.spec
index c2292f6..d92bdd0 100644
--- a/gmic.spec
+++ b/gmic.spec
@@ -10,7 +10,7 @@
Summary: GREYC's Magic for Image Computing
Name: gmic
Version: 2.9.8
-Release: 2%{?dist}
+Release: 3%{?dist}
Source0: https://gmic.eu/files/source/%{name}_%{version}.tar.gz
# GIT archive snapshot of https://github.com/c-koi/zart
Source1: zart-%{zart_version}.tar.gz
@@ -29,7 +29,12 @@ BuildRequires: libtiff-devel
BuildRequires: libpng-devel
BuildRequires: libjpeg-devel
BuildRequires: fftw-devel
+%if 0%{?fedora} > 34
+BuildRequires: openexr-devel
+BuildRequires: imath-devel
+%else
BuildRequires: OpenEXR-devel
+%endif
BuildRequires: zlib-devel
BuildRequires: gimp-devel-tools
BuildRequires: hdf5-devel
@@ -45,6 +50,7 @@ BuildRequires: make
# package despite being a shared library
Obsoletes: gmic-static <= 2.1.8
+Patch0: gmic-openexr3.patch
Patch2: Makefile_arch.patch
@@ -81,6 +87,10 @@ Provides a plugin for using G'MIC from GIMP
%prep
%setup -q -a 1 -a 2 -a 3
+%if 0%{?fedora} > 34
+%patch0 -p1
+%endif
+
%ifarch armv7hl s390x ppc64le
%patch2 -p1 -b.arch
%endif
@@ -189,6 +199,9 @@ fi
%{gimpplugindir}/gmic_cluts.gmz
%changelog
+* Sat Jul 31 2021 Richard Shaw <hobbes1069(a)gmail.com> - 2.9.8-3
+- Rebuild with OpenEXR/Imath 3.
+
* Thu Jul 22 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.9.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
https://src.fedoraproject.org/rpms/gmic/c/80dc95d4ac2fd201978dc2509b380fb...
2Â years, 10Â months
hobbes1069 pushed to OpenImageIO (rawhide). "Rebuild for
OpenEXR/Imath 3."
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-07-31 15:17:09 UTC
From 722fab759c080c0f5c991cd5e746e7c066b44d54 Mon Sep 17 00:00:00 2001
From: Richard Shaw <hobbes1069(a)gmail.com>
Date: Jul 31 2021 15:03:23 +0000
Subject: Rebuild for OpenEXR/Imath 3.
---
diff --git a/OpenImageIO.spec b/OpenImageIO.spec
index 0b32dad..d291d5d 100644
--- a/OpenImageIO.spec
+++ b/OpenImageIO.spec
@@ -3,7 +3,7 @@
Name: OpenImageIO
Version: 2.2.16.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Library for reading and writing images
License: BSD and MIT
@@ -199,9 +199,12 @@ cp -a src/doc/*.1 %{buildroot}%{_mandir}/man1
%changelog
-* Sat Jul 31 2021 Richard Shaw <hobbes1069(a)gmail.com> - 2.2.16.0-2
+* Sat Jul 31 2021 Richard Shaw <hobbes1069(a)gmail.com> - 2.2.16.0-3
- Rebuild for OpenEXR/Imath 3.
+* Wed Jul 21 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.2.16.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
* Sat Jul 03 2021 Richard Shaw <hobbes1069(a)gmail.com> - 2.2.16.0-1
- Update to 2.2.16.0.
https://src.fedoraproject.org/rpms/OpenImageIO/c/722fab759c080c0f5c991cd5...
2Â years, 10Â months
hobbes1069 pushed to OpenImageIO (rawhide). "Rebuild for
OpenEXR/Imath 3."
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-07-31 15:17:09 UTC
From 3b056424f3eb44f85d6a05358fe5201234868584 Mon Sep 17 00:00:00 2001
From: Richard Shaw <hobbes1069(a)gmail.com>
Date: Jul 31 2021 15:02:26 +0000
Subject: Rebuild for OpenEXR/Imath 3.
---
diff --git a/OpenImageIO.spec b/OpenImageIO.spec
index 5ed73df..0b32dad 100644
--- a/OpenImageIO.spec
+++ b/OpenImageIO.spec
@@ -3,7 +3,7 @@
Name: OpenImageIO
Version: 2.2.16.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Library for reading and writing images
License: BSD and MIT
@@ -199,6 +199,9 @@ cp -a src/doc/*.1 %{buildroot}%{_mandir}/man1
%changelog
+* Sat Jul 31 2021 Richard Shaw <hobbes1069(a)gmail.com> - 2.2.16.0-2
+- Rebuild for OpenEXR/Imath 3.
+
* Sat Jul 03 2021 Richard Shaw <hobbes1069(a)gmail.com> - 2.2.16.0-1
- Update to 2.2.16.0.
https://src.fedoraproject.org/rpms/OpenImageIO/c/3b056424f3eb44f85d6a0535...
2Â years, 10Â months
packagerbot pushed to dummy-test-package-gloster (rawhide). "Bump
release (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-07-31 14:53:57 UTC
From f2300f2869b0c9fbbe1bf090b4b01df6f3e34022 Mon Sep 17 00:00:00 2001
From: packagerbot <admin(a)fedoraproject.org>
Date: Jul 31 2021 14:53:52 +0000
Subject: Bump release
Signed-off-by: packagerbot <admin(a)fedoraproject.org>
---
diff --git a/dummy-test-package-gloster.spec b/dummy-test-package-gloster.spec
index e92243e..e0915ef 100644
--- a/dummy-test-package-gloster.spec
+++ b/dummy-test-package-gloster.spec
@@ -3,7 +3,7 @@
Name: dummy-test-package-gloster
Version: 0
-Release: 4797%{?dist}
+Release: 4798%{?dist}
Summary: Dummy Test Package called Gloster
License: CC0
URL: http://fedoraproject.org/wiki/DummyTestPackages
@@ -32,6 +32,9 @@ cp -p uuid %{buildroot}%{_datadir}/%{name}
%{_datadir}/%{name}
%changelog
+* Sat Jul 31 2021 packagerbot <admin(a)fedoraproject.org> - 0-4798
+- rebuilt
+
* Sat Jul 31 2021 packagerbot <admin(a)fedoraproject.org> - 0-4797
- rebuilt
https://src.fedoraproject.org/rpms/dummy-test-package-gloster/c/f2300f286...
2Â years, 10Â months
mkrupcale pushed to libpqxx (rawhide). "Remove unnecessary
BuildRequires which conflicts with libpq-devel (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-07-31 14:32:20 UTC
From a9fc2a6b69ebc10ae57b8b764bf8c3d0e3814679 Mon Sep 17 00:00:00 2001
From: Matthew Krupcale <mkrupcale(a)matthewkrupcale.com>
Date: Jul 31 2021 14:22:58 +0000
Subject: Remove unnecessary BuildRequires which conflicts with libpq-devel
libpqxx only requires the client headers provided by libpq-devel, not the server
headers from postgresql-server-devel. Furthermore, these two packages now
conflict with each other [1,2], so only BuildRequire libpq-devel.
[1] https://fedoraproject.org/wiki/Changes/PostgreSQL_13#Dependencies
[2] https://src.fedoraproject.org/rpms/libpqxx/pull-request/8
---
diff --git a/libpqxx.spec b/libpqxx.spec
index 9953b00..423d329 100644
--- a/libpqxx.spec
+++ b/libpqxx.spec
@@ -5,7 +5,7 @@ Name: libpqxx
Summary: C++ client API for PostgreSQL
Epoch: 1
Version: 7.3.1
-Release: 5%{?dist}
+Release: 6%{?dist}
%global forgeurl https://github.com/jtv/%{name}/
%global tag %{version}
@@ -20,7 +20,6 @@ BuildRequires: ninja-build
BuildRequires: cmake
BuildRequires: pkgconfig
BuildRequires: libpq-devel
-BuildRequires: postgresql-server-devel
%if %{with check}
BuildRequires: postgresql-test-rpm-macros
%endif
@@ -103,6 +102,9 @@ cd -
%endif
%changelog
+* Sat Jul 31 2021 Matthew Krupcale <mkrupcale(a)matthewkrupcale.com> - 1:7.3.1-6
+- Remove unnecessary BuildRequires which conflicts with libpq-devel
+
* Thu Jul 22 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:7.3.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
https://src.fedoraproject.org/rpms/libpqxx/c/a9fc2a6b69ebc10ae57b8b764bf8...
2Â years, 10Â months
hobbes1069 pushed to Field3D (rawhide). "Add minimal patch for
OpenEXR/Imath 3."
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-07-31 14:22:35 UTC
From 7ce3297cf11a589e7e49deb4bce3142802007803 Mon Sep 17 00:00:00 2001
From: Richard Shaw <hobbes1069(a)gmail.com>
Date: Jul 31 2021 14:22:29 +0000
Subject: Add minimal patch for OpenEXR/Imath 3.
---
diff --git a/Field3D-openexr.patch b/Field3D-openexr.patch
new file mode 100644
index 0000000..02e96fd
--- /dev/null
+++ b/Field3D-openexr.patch
@@ -0,0 +1,244 @@
+Index: Field3D-1.7.3/export/StdMathLib.h
+===================================================================
+--- Field3D-1.7.3.orig/export/StdMathLib.h
++++ Field3D-1.7.3/export/StdMathLib.h
+@@ -38,18 +38,41 @@
+ #ifndef _INCLUDED_Field3D_StdMathLib_H_
+ #define _INCLUDED_Field3D_StdMathLib_H_
+
+-#include <OpenEXR/ImathBox.h>
+-#include <OpenEXR/ImathBoxAlgo.h>
+-#include <OpenEXR/ImathColor.h>
+-#include <OpenEXR/ImathHalfLimits.h>
+-#include <OpenEXR/ImathMatrix.h>
+-#include <OpenEXR/ImathMatrixAlgo.h>
+-#include <OpenEXR/ImathPlane.h>
+-#include <OpenEXR/ImathRandom.h>
+-#include <OpenEXR/ImathRoots.h>
+-#include <OpenEXR/ImathVec.h>
+-#include <OpenEXR/half.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++ (100*OPENEXR_VERSION_MINOR) + \
++ OPENEXR_VERSION_PATCH)
+
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++# include <Imath/ImathBox.h>
++# include <Imath/ImathBoxAlgo.h>
++# include <Imath/ImathColor.h>
++# include <Imath/ImathMatrix.h>
++# include <Imath/ImathMatrixAlgo.h>
++# include <Imath/ImathPlane.h>
++# include <Imath/ImathRandom.h>
++# include <Imath/ImathRoots.h>
++# include <Imath/ImathVec.h>
++# include <Imath/half.h>
++#else
++ // OpenEXR 2.x, use the old locations
++# include <OpenEXR/ImathBox.h>
++# include <OpenEXR/ImathBoxAlgo.h>
++# include <OpenEXR/ImathColor.h>
++# include <OpenEXR/ImathHalfLimits.h>
++# include <OpenEXR/ImathMatrix.h>
++# include <OpenEXR/ImathMatrixAlgo.h>
++# include <OpenEXR/ImathPlane.h>
++# include <OpenEXR/ImathRandom.h>
++# include <OpenEXR/ImathRoots.h>
++# include <OpenEXR/ImathVec.h>
++# include <OpenEXR/half.h>
++#endif
+ //----------------------------------------------------------------------------//
+
+ #include "ns.h"
+Index: Field3D-1.7.3/export/Curve.h
+===================================================================
+--- Field3D-1.7.3.orig/export/Curve.h
++++ Field3D-1.7.3/export/Curve.h
+@@ -53,8 +53,25 @@
+
+ #include <boost/lexical_cast.hpp>
+
+-#include <OpenEXR/ImathFun.h>
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++ (100*OPENEXR_VERSION_MINOR) + \
++ OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++# include <Imath/ImathFun.h>
++# include <Imath/ImathMatrix.h>
++#else
++ // OpenEXR 2.x, use the old locations
++# include <OpenEXR/ImathFun.h>
++# include <OpenEXR/ImathMatrix.h>
++#endif
++
+
+ //----------------------------------------------------------------------------//
+
+Index: Field3D-1.7.3/include/OgUtil.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgUtil.h
++++ Field3D-1.7.3/include/OgUtil.h
+@@ -10,7 +10,22 @@
+ #include <iostream>
+ #include <string>
+
+-#include <OpenEXR/ImathVec.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++ (100*OPENEXR_VERSION_MINOR) + \
++ OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++# include <Imath/ImathVec.h>
++#else
++ // OpenEXR 2.x, use the old locations
++# include <OpenEXR/ImathVec.h>
++#endif
+
+ #include "All.h"
+ #include "UtilFoundation.h"
+Index: Field3D-1.7.3/include/UtilFoundation.h
+===================================================================
+--- Field3D-1.7.3.orig/include/UtilFoundation.h
++++ Field3D-1.7.3/include/UtilFoundation.h
+@@ -68,7 +68,22 @@
+
+ #include <memory>
+
+-#include <half.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++ (100*OPENEXR_VERSION_MINOR) + \
++ OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++# include <Imath/half.h>
++#else
++ // OpenEXR 2.x, use the old locations
++# include <OpenEXR/half.h>
++#endif
+
+ #include <iomanip>
+ #include <iostream>
+Index: Field3D-1.7.3/include/OgIAttribute.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgIAttribute.h
++++ Field3D-1.7.3/include/OgIAttribute.h
+@@ -9,7 +9,22 @@
+
+ #include "OgUtil.h"
+
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++ (100*OPENEXR_VERSION_MINOR) + \
++ OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++# include <Imath/ImathMatrix.h>
++#else
++ // OpenEXR 2.x, use the old locations
++# include <OpenEXR/ImathMatrix.h>
++#endif
+
+ //----------------------------------------------------------------------------//
+
+Index: Field3D-1.7.3/CMakeLists.txt
+===================================================================
+--- Field3D-1.7.3.orig/CMakeLists.txt
++++ Field3D-1.7.3/CMakeLists.txt
+@@ -49,7 +49,13 @@ FIND_PACKAGE (Boost COMPONENTS regex thr
+ FIND_PACKAGE (MPI)
+ ENDIF ()
+
+-FIND_PACKAGE (ILMBase)
++# First, try to find just the right config files
++find_package(Imath CONFIG)
++if (NOT TARGET Imath::Imath)
++ # Couldn't find Imath::Imath, maybe it's older and has IlmBase?
++ find_package(IlmBase CONFIG)
++endif ()
++find_package(OpenEXR CONFIG)
+
+ # Allow the developer to select if Dynamic or Static libraries are built
+ OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" ON)
+@@ -146,9 +152,20 @@ IF ( CMAKE_HOST_UNIX )
+ LIST ( APPEND Field3D_Libraries_Shared
+ ${MPI_LIBRARIES} )
+ ENDIF ( MPI_FOUND )
+- LIST ( APPEND Field3D_Libraries_Shared
+- Iex Half IlmThread Imath
+- pthread dl z )
++ if(TARGET Imath::Imath)
++ list(APPEND Field3D_Libraries_Shared
++ # For OpenEXR/Imath 3.x:
++ $<$<TARGET_EXISTS:OpenEXR::OpenEXR>:OpenEXR::OpenEXR>
++ $<$<TARGET_EXISTS:Imath::Imath>:Imath::Imath>
++ $<$<TARGET_EXISTS:Imath::Half>:Imath::Half>
++ pthread
++ dl
++ z)
++ else()
++ LIST ( APPEND Field3D_Libraries_Shared
++ Iex Half IlmThread Imath
++ pthread dl z )
++ endif()
+ SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared} )
+ SET ( Field3D_BIN_Libraries Field3D ${Field3D_Libraries_Shared}
+ ${Boost_LIBRARIES} )
+Index: Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+===================================================================
+--- Field3D-1.7.3.orig/test/unit_tests/UnitTest.cpp
++++ Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+@@ -44,7 +44,22 @@
+ #include <boost/thread/thread.hpp>
+ #include <boost/thread/mutex.hpp>
+
+-#include <OpenEXR/ImathFrustum.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++ (100*OPENEXR_VERSION_MINOR) + \
++ OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++# include <Imath/ImathFrustum.h>
++#else
++ // OpenEXR 2.x, use the old locations
++# include <OpenEXR/ImathFrustum.h>
++#endif
+
+ #include "Field3D/DenseField.h"
+ #include "Field3D/EmptyField.h"
diff --git a/Field3D.spec b/Field3D.spec
index e2c0dad..0667cd3 100644
--- a/Field3D.spec
+++ b/Field3D.spec
@@ -1,6 +1,6 @@
Name: Field3D
Version: 1.7.3
-Release: 11%{?dist}
+Release: 12%{?dist}
Summary: Library for storing voxel data
License: BSD
@@ -8,11 +8,18 @@ URL: https://sites.google.com/site/field3d/
Source0: https://github.com/imageworks/%{name}/archive/v%{version}/%{name}-%{versi...
+Patch0: Field3D-openexr.patch
+
BuildRequires: cmake gcc-c++ doxygen
BuildRequires: hdf5-devel
BuildRequires: boost-devel
+%if 0%{?fedora} > 34
+BuildRequires: cmake(OpenEXR)
+BuildRequires: cmake(Imath)
+%else
BuildRequires: ilmbase-devel
BuildRequires: openexr-devel
+%endif
Requires: hdf5 = %{_hdf5_version}
@@ -67,6 +74,9 @@ pushd %{_vpath_builddir}
%changelog
+* Sat Jul 31 2021 Richard Shaw <hobbes1069(a)gmail.com> - 1.7.3-12
+- Add minimal patch for OpenEXR/Imath 3.
+
* Wed Jul 21 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.7.3-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
https://src.fedoraproject.org/rpms/Field3D/c/7ce3297cf11a589e7e49deb4bce3...
2Â years, 10Â months