public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/xbase] rawhide: update to 4.2.7
@ 2026-07-27 15:15 Filipe Rosset
  0 siblings, 0 replies; only message in thread
From: Filipe Rosset @ 2026-07-27 15:15 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/xbase
Branch : rawhide
Commit : a80d4d990e3cac60fbb38ec0b89825b346471334
Author : Filipe Rosset <rosset.filipe@gmail.com>
Date   : 2026-07-21T00:01:28-03:00
Stats  : +70/-92 in 10 file(s)
URL    : https://src.fedoraproject.org/rpms/xbase/c/a80d4d990e3cac60fbb38ec0b89825b346471334?branch=rawhide

Log:
update to 4.2.7

---
diff --git a/.gitignore b/.gitignore
index 347d067..c3e1cb0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-xbase64-3.1.2.tar.gz
-/xbase64-4.2.6.tar.gz
+/xbase64-*.tar.gz

diff --git a/sources b/sources
index 479cdf5..7297858 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xbase64-4.2.6.tar.gz) = 9279b1c45dc7268ae14f60e96e665900b9cd2eb753bd7061c8657c09bc2b53a6bdcc1cc3d32bb4daa7e66e5dd3e879a153a5c74d174434d8101c73e46fc83339
+SHA512 (xbase64-4.2.7.tar.gz) = 26d490076e703fe4f545d404a963df8289bb886fd1d1cd330c3d61e95f6af27c33c68ac3960221d7a209f4e0b14776c380142ed4184bf3008f9f46e8ce82cd97

diff --git a/xbase-4.2.6-fix-mandir.patch b/xbase-4.2.6-fix-mandir.patch
deleted file mode 100644
index 279dbdf..0000000
--- a/xbase-4.2.6-fix-mandir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up xbase64-4.2.6/build/linux64/CMakeLists.txt.fix-mandir xbase64-4.2.6/build/linux64/CMakeLists.txt
---- xbase64-4.2.6/build/linux64/CMakeLists.txt.fix-mandir	2025-11-06 12:03:41.583830105 -0500
-+++ xbase64-4.2.6/build/linux64/CMakeLists.txt	2025-11-06 12:03:51.233202792 -0500
-@@ -932,7 +932,7 @@ install (FILES ${PROJECT_PARENT_DIR}/doc
-                ${PROJECT_PARENT_DIR}/docs/man/xb_tblinfo.1.gz
-                ${PROJECT_PARENT_DIR}/docs/man/xb_undelall.1.gz
- 
--         DESTINATION man/man1)
-+         DESTINATION share/man/man1)
- 
- ENDIF( NOT WIN32 )
- 

diff --git a/xbase-4.2.6-fix-sover.patch b/xbase-4.2.6-fix-sover.patch
deleted file mode 100644
index 70b9f1c..0000000
--- a/xbase-4.2.6-fix-sover.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up xbase64-4.2.6/build/linux64/CMakeLists.txt.fix-sover xbase64-4.2.6/build/linux64/CMakeLists.txt
---- xbase64-4.2.6/build/linux64/CMakeLists.txt.fix-sover	2025-11-06 11:53:25.847743173 -0500
-+++ xbase64-4.2.6/build/linux64/CMakeLists.txt	2025-11-06 11:53:30.928265938 -0500
-@@ -937,7 +937,7 @@ install (FILES ${PROJECT_PARENT_DIR}/doc
- ENDIF( NOT WIN32 )
- 
- 
--SET_TARGET_PROPERTIES( ${XB_LIBNAME} PROPERTIES VERSION 4.2.6 SOVERSION 0 )
-+SET_TARGET_PROPERTIES( ${XB_LIBNAME} PROPERTIES VERSION ${xbase_VERSION_MAJOR}.${xbase_VERSION_MINOR}.${xbase_VERSION_PATCH} SOVERSION ${xbase_VERSION_MAJOR} )
- 
- IF( WIN32 )
-   install (TARGETS ${XB_LIBNAME}     DESTINATION bin)

diff --git a/xbase-4.2.6-missing-includes.patch b/xbase-4.2.6-missing-includes.patch
deleted file mode 100644
index 2bf3c6e..0000000
--- a/xbase-4.2.6-missing-includes.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -up xbase64-4.2.6/build/linux64/CMakeLists.txt.missing-includes xbase64-4.2.6/build/linux64/CMakeLists.txt
---- xbase64-4.2.6/build/linux64/CMakeLists.txt.missing-includes	2025-11-06 12:25:44.626950995 -0500
-+++ xbase64-4.2.6/build/linux64/CMakeLists.txt	2025-11-06 12:27:13.712443288 -0500
-@@ -889,6 +889,7 @@ ENDIF( XB_UTILS_SUPPORT )
- 
- install (FILES ${PROJECT_SOURCE_DIR}/include/xbase.h
-                ${PROJECT_SOURCE_DIR}/include/xbbcd.h
-+               ${PROJECT_SOURCE_DIR}/include/xbbit.h
-                ${PROJECT_SOURCE_DIR}/include/xbblkread.h
-                ${PROJECT_SOURCE_DIR}/include/xbblob.h
-                ${PROJECT_BINARY_DIR}/include/xbconfig.h
-@@ -906,6 +907,7 @@ install (FILES ${PROJECT_SOURCE_DIR}/inc
-                ${PROJECT_SOURCE_DIR}/include/xblnknod.h
-                ${PROJECT_SOURCE_DIR}/include/xblog.h
-                ${PROJECT_SOURCE_DIR}/include/xbmemo.h
-+               ${PROJECT_SOURCE_DIR}/include/xbrelate.h
-                ${PROJECT_SOURCE_DIR}/include/xbretcod.h
-                ${PROJECT_SOURCE_DIR}/include/xbsql.h
-                ${PROJECT_SOURCE_DIR}/include/xbstring.h

diff --git a/xbase-4.2.6-no-local-no-namespace.patch b/xbase-4.2.6-no-local-no-namespace.patch
deleted file mode 100644
index bc7bf96..0000000
--- a/xbase-4.2.6-no-local-no-namespace.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -up xbase64-4.2.6/build/linux64/CMakeLists.txt.no-local-no-namespace xbase64-4.2.6/build/linux64/CMakeLists.txt
---- xbase64-4.2.6/build/linux64/CMakeLists.txt.no-local-no-namespace	2025-11-06 11:56:05.142403593 -0500
-+++ xbase64-4.2.6/build/linux64/CMakeLists.txt	2025-11-06 11:56:34.043999040 -0500
-@@ -942,9 +942,9 @@ SET_TARGET_PROPERTIES( ${XB_LIBNAME} PRO
- IF( WIN32 )
-   install (TARGETS ${XB_LIBNAME}     DESTINATION bin)
- ELSE( WIN32 )
--  IF( EXISTS /usr/local/lib64 )
--    install (TARGETS ${XB_LIBNAME}     DESTINATION lib64/${CMAKE_PROJECT_NAME})
--  ELSE( EXISTS /usr/local/lib64 )
--    install (TARGETS ${XB_LIBNAME}     DESTINATION lib/${CMAKE_PROJECT_NAME})
--  ENDIF( EXISTS /usr/local/lib64 )
-+  IF( EXISTS /usr/lib64 )
-+    install (TARGETS ${XB_LIBNAME}     DESTINATION lib64)
-+  ELSE( EXISTS /usr/lib64 )
-+    install (TARGETS ${XB_LIBNAME}     DESTINATION lib)
-+  ENDIF( EXISTS /usr/lib64 )
- ENDIF( WIN32 )

diff --git a/xbase-4.2.7-fix-mandir.patch b/xbase-4.2.7-fix-mandir.patch
new file mode 100644
index 0000000..5da00c2
--- /dev/null
+++ b/xbase-4.2.7-fix-mandir.patch
@@ -0,0 +1,11 @@
+--- xbase64-4.2.7/build/linux64/CMakeLists.txt	2026-07-20 23:51:46.699282028 -0300
++++ xbase64-4.2.7/build/linux64/CMakeLists.txt	2026-07-20 23:51:46.702611613 -0300
+@@ -954,7 +954,7 @@ install (FILES ${PROJECT_PARENT_DIR}/doc
+                ${PROJECT_PARENT_DIR}/docs/man/xb_tblinfo.1.gz
+                ${PROJECT_PARENT_DIR}/docs/man/xb_undelall.1.gz
+ 
+-         DESTINATION man/man1)
++         DESTINATION share/man/man1)
+ 
+ ENDIF( NOT WIN32 )
+ 

diff --git a/xbase-4.2.7-fix-sover.patch b/xbase-4.2.7-fix-sover.patch
new file mode 100644
index 0000000..dd0341b
--- /dev/null
+++ b/xbase-4.2.7-fix-sover.patch
@@ -0,0 +1,20 @@
+--- xbase64-4.2.7/build/linux64/CMakeLists.txt	2026-07-20 23:51:46.699282028 -0300
++++ xbase64-4.2.7/build/linux64/CMakeLists.txt	2026-07-20 23:51:46.699513695 -0300
+@@ -310,7 +310,7 @@ ENDIF( XB_NDX_SUPPORT OR XB_MDX_SUPPORT
+ 
+ # Set directories
+ # PROJECT_PARENT_DIR is two nodes higher
+-get_filename_component( PROJECT_PARENT_DIR ${PROJECT_BINARY_DIR} DIRECTORY )
++get_filename_component( PROJECT_PARENT_DIR ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY )
+ get_filename_component( PROJECT_PARENT_DIR ${PROJECT_PARENT_DIR} DIRECTORY )
+ 
+ # MESSAGE( "PROJECT_PARENT_DIR = " ${PROJECT_PARENT_DIR} )
+@@ -959,7 +959,7 @@ install (FILES ${PROJECT_PARENT_DIR}/doc
+ ENDIF( NOT WIN32 )
+ 
+ 
+-SET_TARGET_PROPERTIES( ${XB_LIBNAME} PROPERTIES VERSION 4.2.7 SOVERSION 0 )
++SET_TARGET_PROPERTIES( ${XB_LIBNAME} PROPERTIES VERSION ${xbase_VERSION_MAJOR}.${xbase_VERSION_MINOR}.${xbase_VERSION_PATCH} SOVERSION ${xbase_VERSION_MAJOR} )
+ 
+ IF( WIN32 )
+   install (TARGETS ${XB_LIBNAME}     DESTINATION bin)

diff --git a/xbase-4.2.7-no-local-no-namespace.patch b/xbase-4.2.7-no-local-no-namespace.patch
new file mode 100644
index 0000000..907811d
--- /dev/null
+++ b/xbase-4.2.7-no-local-no-namespace.patch
@@ -0,0 +1,17 @@
+--- xbase64-4.2.7/build/linux64/CMakeLists.txt	2026-07-20 23:51:46.699282028 -0300
++++ xbase64-4.2.7/build/linux64/CMakeLists.txt	2026-07-20 23:51:46.701203821 -0300
+@@ -964,9 +964,9 @@ SET_TARGET_PROPERTIES( ${XB_LIBNAME} PRO
+ IF( WIN32 )
+   install (TARGETS ${XB_LIBNAME}     DESTINATION bin)
+ ELSE( WIN32 )
+-  IF( EXISTS /usr/local/lib64 )
+-    install (TARGETS ${XB_LIBNAME}     DESTINATION lib64/${CMAKE_PROJECT_NAME})
+-  ELSE( EXISTS /usr/local/lib64 )
+-    install (TARGETS ${XB_LIBNAME}     DESTINATION lib/${CMAKE_PROJECT_NAME})
+-  ENDIF( EXISTS /usr/local/lib64 )
++  IF( EXISTS /usr/lib64 )
++    install (TARGETS ${XB_LIBNAME}     DESTINATION lib64)
++  ELSE( EXISTS /usr/lib64 )
++    install (TARGETS ${XB_LIBNAME}     DESTINATION lib)
++  ENDIF( EXISTS /usr/lib64 )
+ ENDIF( WIN32 )

diff --git a/xbase.spec b/xbase.spec
index 765384b..5ae20bd 100644
--- a/xbase.spec
+++ b/xbase.spec
@@ -1,19 +1,19 @@
-%global __cmake_in_source_build 1
-
 Name:		xbase
 Summary:	XBase compatible database library
-Version:	4.2.6
-Release:	3%{?dist}
+Version:	4.2.7
+Release:	1%{?dist}
 License:	LGPL-3.0-or-later
 URL:		http://linux.techass.com/projects/xdb/
 Source0:	http://downloads.sourceforge.net/xdb/%{name}64-%{version}.tar.gz
-Patch0:		xbase-4.2.6-fix-sover.patch
-Patch1:		xbase-4.2.6-no-local-no-namespace.patch
-Patch2:		xbase-4.2.6-fix-mandir.patch
-Patch3:		xbase-4.2.6-missing-includes.patch
-BuildRequires:	make
+Patch0:		xbase-4.2.7-fix-sover.patch
+Patch1:		xbase-4.2.7-no-local-no-namespace.patch
+Patch2:		xbase-4.2.7-fix-mandir.patch
+
+BuildRequires:	cmake
+BuildRequires:	doxygen
 BuildRequires:	gcc-c++
-BuildRequires:	doxygen, libtool, cmake
+BuildRequires:	libtool
+BuildRequires:	make
 Provides:	xbase64 = %{version}-%{release}
 
 %description
@@ -49,25 +49,16 @@ reindex (rebuild an index), undelall (undeletes all deleted records in a file),
 zap (remove all records from a DBF file).
 
 %prep
-%setup -q -n %{name}64-%{version}
-%patch -P0 -p1 -b .fix-sover
-%patch -P1 -p1 -b .no-local-no-namespace
-%patch -P2 -p1 -b .fix-mandir
-%patch -P3 -p1 -b .missing-includes
+%autosetup -n %{name}64-%{version} -p1
 
 chmod -x NEWS README docs/html/*
 
 %build
-cd build/linux64
-%cmake .
-make %{?_smp_mflags}
+%cmake -S build/linux64
+%cmake_build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-pushd build/linux64
 %cmake_install
-popd
-rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
 
 # Fix files for multilib
 touch -r COPYING docs/html/*.html
@@ -83,16 +74,13 @@ ln -s Xbase64 xbase
 popd
 
 %check
-pushd build/linux64
-make test
-popd
-
-%ldconfig_scriptlets
+export TZ=UTC
+%ctest -j1
 
 %files
 %license COPYING
 %doc NEWS README
-%{_libdir}/*.so.*
+%{_libdir}/libxbase*.so.*
 
 %files devel
 %doc docs/html
@@ -108,6 +96,7 @@ popd
 %{_bindir}/xb_deletall
 %{_bindir}/xb_dumpdbt
 %{_bindir}/xb_dumprecs
+%{_bindir}/xb_dumptag
 %{_bindir}/xb_execsql
 %{_bindir}/xb_import
 %{_bindir}/xb_pack
@@ -117,6 +106,9 @@ popd
 %{_mandir}/man1/xb_*.1*
 
 %changelog
+* Tue Jul 21 2026 Filipe Rosset <rosset.filipe@gmail.com> - 4.2.7-1
+- update to 4.2.7
+
 * Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
 

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-07-27 15:15 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-27 15:15 [rpms/xbase] rawhide: update to 4.2.7 Filipe Rosset

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox