7:59 a.m.
The package rpms/xtrkcad.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/xtrkcad.git/commit/?id=f2db1333ed...
https://src.fedoraproject.org/cgit/rpms/xtrkcad.git/commit/?id=4945d15353....
Change:
-ExcludeArch: i686,aarch64,ppc64le,s390x
+ExcludeArch: i686,aarch64,ppc64le,s390x
Thanks.
Full change:
============
commit f2db1333ed595a210a035a9d919ed70116e6eb7b
Author: Phil Cameron <pecameron1(a)gmail.com>
Date: Fri Apr 26 17:28:06 2024 -0400
Patch 5.3.0 to build using shared libzip
diff --git a/xtrkcad-5.3.0GA.libzip.patch b/xtrkcad-5.3.0GA.libzip.patch
new file mode 100644
index 0000000..0b06790
--- /dev/null
+++ b/xtrkcad-5.3.0GA.libzip.patch
@@ -0,0 +1,12 @@
+diff -ru orig/xtrkcad-source-5.2.2GA/CMake/FindLibzip.cmake
xtrkcad-source-5.2.2GA/CMake/FindLibzip.cmake
+--- ../orig/xtrkcad-source-5.3.0GA/CMake/FindLibzip.cmake 2024-04-26 16:32:22.562688405
-0400
++++ xtrkcad-source-5.3.0GA/CMake/FindLibzip.cmake 2024-04-13 10:34:00.000000000 -0400
+@@ -38,7 +38,7 @@
+
+ if(UNIX AND NOT APPLE)
+ find_library(LIBZIP_LIBRARY
+- NAMES libzip.a zip
++ NAMES libzip.so libzip.a zip
+ PATHS
+ /usr/lib64
+ /usr/lib
diff --git a/xtrkcad.spec b/xtrkcad.spec
index c1e26de..b5a0cd2 100644
--- a/xtrkcad.spec
+++ b/xtrkcad.spec
@@ -5,7 +5,8 @@ Release: 1%{?dist}
License: GPLv2
URL: https://sourceforge.net/projects/xtrkcad-fork
Source0:
https://sourceforge.net/projects/xtrkcad-fork/files/XTrackCad/Version%20%...
-ExcludeArch: i686,aarch64,ppc64le,s390x
+# fix build to use dynamic libzip
+Patch0: xtrkcad-5.3.0GA.libzip.patch
BuildRequires: gcc
BuildRequires: gcc-c++
@@ -42,6 +43,7 @@ car inventory. Documents/help is in xtrkcad-doc rpm.
%prep
%setup -n xtrkcad-source-%{version}GA -q
+%patch 0 -p1
%package doc
Summary: Documentation for %{name}
commit 4945d1535352fe51285f3b0e9c535c0c113b8253
Author: Phil Cameron <pecameron1(a)gmail.com>
Date: Fri Apr 26 14:51:30 2024 -0400
Build xtrkcad 5.3.0 packages
diff --git a/.gitignore b/.gitignore
index 0857f78..fdbcbeb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/xtrkcad-source-5.2.2GA.tar.gz
+/xtrkcad-source-5.3.0GA.tar.gz
diff --git a/sources b/sources
index 43bc5e4..399f29f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xtrkcad-source-5.2.2GA.tar.gz) =
9a65a0f6fa0a5915179a1072693d54848be90b875a9a1c42b0de8298215718dd683574f9f4fa5f4426fbd4ea3d06c614f0c4184ed4137335c16731574b708b68
+SHA512 (xtrkcad-source-5.3.0GA.tar.gz) =
52c550766be0d6b9cc4a505d48e09fb1cd1de001443074727ca9f4276b8e270bd08e8ba8d3960bd1571036de4ec725694206a34fcb1555adb81c42e5f9a5817d
diff --git a/xtrkcad-5.2.2GA-xtrkcad.desktop.patch
b/xtrkcad-5.2.2GA-xtrkcad.desktop.patch
deleted file mode 100644
index 54f74dc..0000000
--- a/xtrkcad-5.2.2GA-xtrkcad.desktop.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-diff -ru orig/xtrkcad-source-5.2.2GA/app/bin/CMakeLists.txt
xtrkcad-source-5.2.2GA/app/bin/CMakeLists.txt
---- orig/xtrkcad-source-5.2.2GA/app/bin/CMakeLists.txt 2021-12-18 12:12:02.000000000
-0500
-+++ xtrkcad-source-5.2.2GA/app/bin/CMakeLists.txt 2022-02-21 15:22:10.656926058 -0500
-@@ -169,7 +169,6 @@
- utility.c
- utility.h
- validator.c
-- cJSON.c
- archive.h
- directory.h
- manifest.h
-@@ -237,10 +236,7 @@
- # This ensures that messages.h has been generated before we build xtrkcad-lib
- ADD_DEPENDENCIES(xtrkcad-lib Help)
-
--TARGET_LINK_LIBRARIES(xtrkcad xtrkcad-lib)
--TARGET_LINK_LIBRARIES(xtrkcad xtrkcad-wlib)
--TARGET_LINK_LIBRARIES(xtrkcad xtrkcad-cornu)
--TARGET_LINK_LIBRARIES(xtrkcad dynstring)
-+TARGET_LINK_LIBRARIES(xtrkcad xtrkcad-lib xtrkcad-wlib xtrkcad-cornu dynstring cjson)
- if(XTRKCAD_CREATE_SVG)
- IF(UNIX)
- if (NOT APPLE)
-diff -ru orig/xtrkcad-source-5.2.2GA/app/bin/fileio.c
xtrkcad-source-5.2.2GA/app/bin/fileio.c
---- orig/xtrkcad-source-5.2.2GA/app/bin/fileio.c 2021-12-18 10:31:35.000000000 -0500
-+++ xtrkcad-source-5.2.2GA/app/bin/fileio.c 2022-02-20 10:51:17.258176965 -0500
-@@ -20,7 +20,7 @@
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
--#include <cJSON.h>
-+#include <cjson/cJSON.h>
-
- #include "archive.h"
- #include "common.h"
-Only in orig/xtrkcad-source-5.2.2GA/app/bin/include: dirent.h
-Only in xtrkcad-source-5.2.2GA/app/bin/include: dirent.h.phil
-diff -ru orig/xtrkcad-source-5.2.2GA/app/bin/manifest.c
xtrkcad-source-5.2.2GA/app/bin/manifest.c
---- orig/xtrkcad-source-5.2.2GA/app/bin/manifest.c 2021-12-18 10:31:34.000000000 -0500
-+++ xtrkcad-source-5.2.2GA/app/bin/manifest.c 2022-02-20 10:51:14.426213927 -0500
-@@ -21,7 +21,7 @@
-
- #include <string.h>
-
--#include "cJSON.h"
-+#include <cjson/cJSON.h>
- #include "fileio.h"
- #include "layout.h"
- #include "misc2.h"
-diff -ru orig/xtrkcad-source-5.2.2GA/app/help/CMakeLists.txt
xtrkcad-source-5.2.2GA/app/help/CMakeLists.txt
---- orig/xtrkcad-source-5.2.2GA/app/help/CMakeLists.txt 2021-12-18 10:27:44.000000000
-0500
-+++ xtrkcad-source-5.2.2GA/app/help/CMakeLists.txt 2022-02-21 15:24:51.868816364 -0500
-@@ -1,6 +1,6 @@
- PROJECT(help)
-
--ADD_EXECUTABLE(genhelp genhelp.c cJSON.c cJSON.h)
-+ADD_EXECUTABLE(genhelp genhelp.c)
-
- ADD_EXECUTABLE(genmessages genmessages.c)
-
-@@ -10,6 +10,8 @@
- SET(GENMESSAGES_OPTS "")
- ENDIF(XTRKCAD_USE_GETTEXT)
-
-+TARGET_LINK_LIBRARIES(genhelp PUBLIC cjson)
-+
- ADD_CUSTOM_COMMAND(
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/messages.h ${CMAKE_CURRENT_BINARY_DIR}/messages.but
- DEPENDS genmessages ${CMAKE_CURRENT_SOURCE_DIR}/messages.in
-diff -ru orig/xtrkcad-source-5.2.2GA/app/help/genhelp.c
xtrkcad-source-5.2.2GA/app/help/genhelp.c
---- orig/xtrkcad-source-5.2.2GA/app/help/genhelp.c 2021-12-18 10:27:44.000000000 -0500
-+++ xtrkcad-source-5.2.2GA/app/help/genhelp.c 2022-02-20 10:28:37.155745877 -0500
-@@ -20,7 +20,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
--#include "cJSON.h"
-+#include <cjson/cJSON.h>
-
- #define I18NHEADERFILE "i18n.h"
-
-diff -ru orig/xtrkcad-source-5.2.2GA/app/lib/CMakeLists.txt
xtrkcad-source-5.2.2GA/app/lib/CMakeLists.txt
---- orig/xtrkcad-source-5.2.2GA/app/lib/CMakeLists.txt 2021-12-18 12:12:02.000000000
-0500
-+++ xtrkcad-source-5.2.2GA/app/lib/CMakeLists.txt 2022-02-21 15:25:06.717622045 -0500
-@@ -42,10 +42,6 @@
- endif()
-
- if(UNIX AND NOT APPLE)
-- install(PROGRAMS
-- xdg-open xtrkcad-setup
-- DESTINATION ${XTRKCAD_SHARE_INSTALL_DIR}
-- )
- install(FILES
- xtrkcad.desktop xtrkcad.xml
- DESTINATION "${XTRKCAD_SHARE_INSTALL_DIR}/applications"
-diff -ru orig/xtrkcad-source-5.2.2GA/CMakeLists.txt
xtrkcad-source-5.2.2GA/CMakeLists.txt
---- orig/xtrkcad-source-5.2.2GA/CMakeLists.txt 2021-12-18 13:10:04.000000000 -0500
-+++ xtrkcad-source-5.2.2GA/CMakeLists.txt 2022-02-21 15:30:10.711643816 -0500
-@@ -1,6 +1,6 @@
- PROJECT(XTrkCAD)
- enable_testing()
--cmake_minimum_required(VERSION 2.8)
-+cmake_minimum_required(VERSION 3.22)
- set(CMAKE_MACOSX_RPATH 0)
-
- # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
diff --git a/xtrkcad.spec b/xtrkcad.spec
index e9779d8..c1e26de 100644
--- a/xtrkcad.spec
+++ b/xtrkcad.spec
@@ -1,14 +1,11 @@
Name: xtrkcad
Summary: CAD for Model Railroad layout
-Version: 5.2.2
-Release: 5%{?dist}
+Version: 5.3.0
+Release: 1%{?dist}
License: GPLv2
URL: https://sourceforge.net/projects/xtrkcad-fork
Source0:
https://sourceforge.net/projects/xtrkcad-fork/files/XTrackCad/Version%20%...
-# patch (to be removed on next GA release)
-# patch0 adds xtrkcad.desktop to build - Changed upstream
-# It also uses cJSON and xdg-utils packages
-Patch0: xtrkcad-5.2.2GA-xtrkcad.desktop.patch
+ExcludeArch: i686,aarch64,ppc64le,s390x
BuildRequires: gcc
BuildRequires: gcc-c++
@@ -22,6 +19,12 @@ BuildRequires: glibc-devel
BuildRequires: pandoc
BuildRequires: doxygen
BuildRequires: cjson-devel
+BuildRequires: mxml
+BuildRequires: mxml-devel
+BuildRequires: freeimage
+BuildRequires: freeimage-devel
+BuildRequires: inkscape
+BuildRequires: inkscape-libs
Requires: xdg-utils
@@ -35,20 +38,17 @@ flex-track to modify, extend and join tracks and turnouts.
Additional features include tunnels, 'post-it' notes, on-screen
ruler, parts list, 99 drawing layers, undo/redo commands,
benchwork, 'Print to BitMap', elevations, train simulation and
-car inventory.
+car inventory. Documents/help is in xtrkcad-doc rpm.
%prep
%setup -n xtrkcad-source-%{version}GA -q
-# removed on next GA release
-%patch0 -p1
-
%package doc
Summary: Documentation for %{name}
BuildArch: noarch
%description doc
-This package contains user documentation for XTrkCad,
+This package contains user documentation and help for XTrkCAD,
in HTML format. It also contains demos, and examples.
%build
@@ -90,8 +90,17 @@ mv %{buildroot}/%{_datadir}/%{name}/applications/xtrkcad.xml \
%{_datadir}/%{name}/demos
%{_datadir}/%{name}/examples
%{_datadir}/%{name}/html
+%{_datadir}/locale/cy_GB/LC_MESSAGES/%{name}.mo
+%{_datadir}/locale/de_DE/LC_MESSAGES/%{name}.mo
+%{_datadir}/locale/fi/LC_MESSAGES/%{name}.mo
+%{_datadir}/locale/fr_FR/LC_MESSAGES/%{name}.mo
+%{_datadir}/locale/pt_BR/LC_MESSAGES/%{name}.mo
+%{_datadir}/locale/ru/LC_MESSAGES/%{name}.mo
%changelog
+* Fri Apr 26 2024 Phil Cameron <pecameron1 -at- gmail.com> 5.3.0-1
+- V5.3.0 GA
+
* Sat Jan 27 2024 Fedora Release Engineering <releng(a)fedoraproject.org> - 5.2.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild