scm-commits March 2022

scm-commits@lists.fedoraproject.org

1 participants
35002 discussions

pagure pushed to redhat-rpm-config (rawhide). "Add %__brp_remove_la_files to __os_install_post"
by notifications＠fedoraproject.org 01 Mar '22

01 Mar '22

Notification time stamped 2022-02-22 10:24:05 UTC From ccc728db6d723853e914b8905880d9befc330504 Mon Sep 17 00:00:00 2001 From: Timm Bäder <tbaeder(a)redhat.com> Date: Feb 21 2022 08:19:27 +0000 Subject: Add %__brp_remove_la_files to __os_install_post --- diff --git a/buildflags.md b/buildflags.md index 6e31bfb..106f9f5 100644 --- a/buildflags.md +++ b/buildflags.md @@ -333,6 +333,8 @@ These steps can be skipped by undefining the corresponding macros: are loadable immediately after installation, even if they are not yet listed in the `/etc/ld.so.cache` file (because `ldconfig` has not been invoked yet). +* `__brp_remove_la_files`: This step removes libtool-generated `.la` + files from the installed files. # Individual compiler flags diff --git a/macros b/macros index 54659c1..2314c2a 100644 --- a/macros +++ b/macros @@ -268,6 +268,7 @@ print(result) %{?__brp_strip_static_archive} \ %{?__brp_check_rpaths} \ %{?__brp_mangle_shebangs} \ + %{?__brp_remove_la_files} \ %{__os_install_post_python} \ %{nil} diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec index 67dcf97..27cb267 100644 --- a/redhat-rpm-config.spec +++ b/redhat-rpm-config.spec @@ -6,7 +6,7 @@ Summary: Red Hat specific rpm configuration files Name: redhat-rpm-config -Version: 214 +Version: 215 Release: 1%{?dist} # No version specified. License: GPL+ @@ -191,6 +191,9 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora/srpm forge.lua %doc buildflags.md %changelog +* Mon Feb 21 2022 Timm Bäder <tbaeder(a)redhat.com> - 215-1 +- Add %%__brp_remove_la_files to %%__os_install_post + * Thu Feb 10 2022 Florian Weimer <fweimer(a)redhat.com> - 214-1 - ppc64le: Switch baseline to POWER9 on ELN (ELN issue 78) https://src.fedoraproject.org/rpms/redhat-rpm-config/c/ccc728db6d723853e914…

1 0

tagoh pushed to sil-namdhinggo-fonts (rawhide). "1.004-11 (..more)"
by notifications＠fedoraproject.org 01 Mar '22

01 Mar '22

Notification time stamped 2022-02-22 10:23:49 UTC From 9cdfda527cdb4d4afcbff88c3ceb3a9daa2ece01 Mon Sep 17 00:00:00 2001 From: Akira TAGOH <akira(a)tagoh.org> Date: Feb 22 2022 10:23:43 +0000 Subject: 1.004-11 Fix FTBFS. --- diff --git a/sil-namdhinggo-fonts.spec b/sil-namdhinggo-fonts.spec index a3e1b21..f4ff689 100644 --- a/sil-namdhinggo-fonts.spec +++ b/sil-namdhinggo-fonts.spec @@ -1,6 +1,6 @@ # SPDX-License-Identifier: MIT Version: 1.004 -Release: 10%{?dist} +Release: 11%{?dist} %global foundry SIL %global fontlicense OFL @@ -29,12 +29,8 @@ reincarnation of the first Sirijonga. The modern Sirijonga was apparently martyred in 1741 for the sake of this script by lamas in Sikkim. The script was named ‘Sirijonga’ in his honor by the Limbu scholar Iman Singh Chemjong.} -%fontmeta - -%global source_files %{expand: Source0: https://software.sil.org/downloads/r/%{projectname}/%{archivename}.zip Source10: 66-%{fontpkgname}.xml -} %fontpkg @@ -54,6 +50,10 @@ Source10: 66-%{fontpkgname}.xml %fontfiles %changelog +* Tue Feb 22 2022 Akira TAGOH <tagoh(a)redhat.com> +- 1.004-11 +- Fix FTBFS. + * Sat Jan 22 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild https://src.fedoraproject.org/rpms/sil-namdhinggo-fonts/c/9cdfda527cdb4d4af…

1 0

ellert pushed to HepMC3 (rawhide). "Fix detection of installed Pythia HepMC3 interface (..more)"
by notifications＠fedoraproject.org 01 Mar '22

01 Mar '22

Notification time stamped 2022-02-22 10:10:35 UTC This commit already existed in another branch. https://src.fedoraproject.org/rpms/HepMC3/c/57709be0724426354a8d4a23b4aadcf…

1 0

ellert pushed to HepMC3 (f35). "Fix detection of installed Pythia HepMC3 interface (..more)"
by notifications＠fedoraproject.org 01 Mar '22

01 Mar '22

Notification time stamped 2022-02-22 10:10:35 UTC This commit already existed in another branch. https://src.fedoraproject.org/rpms/HepMC3/c/57709be0724426354a8d4a23b4aadcf…

1 0

ellert pushed to HepMC3 (f34). "Fix detection of installed Pythia HepMC3 interface (..more)"
by notifications＠fedoraproject.org 01 Mar '22

01 Mar '22

Notification time stamped 2022-02-22 10:10:35 UTC This commit already existed in another branch. https://src.fedoraproject.org/rpms/HepMC3/c/57709be0724426354a8d4a23b4aadcf…

1 0

ellert pushed to HepMC3 (epel8). "Fix detection of installed Pythia HepMC3 interface (..more)"
by notifications＠fedoraproject.org 01 Mar '22

01 Mar '22

Notification time stamped 2022-02-22 10:10:35 UTC This commit already existed in another branch. https://src.fedoraproject.org/rpms/HepMC3/c/57709be0724426354a8d4a23b4aadcf…

1 0

ellert pushed to HepMC3 (epel7). "Fix detection of installed Pythia HepMC3 interface (..more)"
by notifications＠fedoraproject.org 01 Mar '22

01 Mar '22

Notification time stamped 2022-02-22 10:10:35 UTC From 57709be0724426354a8d4a23b4aadcf3e5b7cfc1 Mon Sep 17 00:00:00 2001 From: Mattias Ellert <mattias.ellert(a)physics.uu.se> Date: Feb 22 2022 10:09:35 +0000 Subject: Fix detection of installed Pythia HepMC3 interface Fix endian issue in HEPEVT wrappers Fix doxygen markup syntax --- diff --git a/HepMC3-dox.patch b/HepMC3-dox.patch new file mode 100644 index 0000000..ac08f72 --- /dev/null +++ b/HepMC3-dox.patch @@ -0,0 +1,47 @@ +From c9ed7dd11e79151497c3001c0ae0ba0ed1165503 Mon Sep 17 00:00:00 2001 +From: Mattias Ellert <mattias.ellert(a)physics.uu.se> +Date: Tue, 22 Feb 2022 10:21:50 +0100 +Subject: [PATCH] Fix doxygen markup + +Fixes warnings: + +.../HepMC3-3.2.5/include/HepMC3/HEPEVT_Wrapper_Runtime.h:62: warning: Member allocate_internal_storage() (function) of class HepMC3::HEPEVT_Wrapper_Runtime is not documented. +.../HepMC3-3.2.5/include/HepMC3/HEPEVT_Wrapper_Template.h:62: warning: Member allocate_internal_storage() (function) of class HepMC3::HEPEVT_Wrapper_Template is not documented. +--- + include/HepMC3/HEPEVT_Wrapper_Runtime.h | 4 ++-- + include/HepMC3/HEPEVT_Wrapper_Template.h | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/include/HepMC3/HEPEVT_Wrapper_Runtime.h b/include/HepMC3/HEPEVT_Wrapper_Runtime.h +index 6bbb0b6..d640314 100644 +--- a/include/HepMC3/HEPEVT_Wrapper_Runtime.h ++++ b/include/HepMC3/HEPEVT_Wrapper_Runtime.h +@@ -59,8 +59,8 @@ private: + // Accessors + // + public: +- void allocate_internal_storage(); ///!< Allocates m_internal_storage storage in smart pointer to hold HEPEVT of fixed size +- void copy_to_internal_storage(char *c, int N); ///!< Copies the content of foreight common block into the internal storage ++ void allocate_internal_storage(); //!< Allocates m_internal_storage storage in smart pointer to hold HEPEVT of fixed size ++ void copy_to_internal_storage( char *c, int N ); //!< Copies the content of foreight common block into the internal storage + void set_max_number_entries( unsigned int size ) { m_max_particles = size; }//!< Set block size + void set_hepevt_address(char *c); //!< Set Fortran block address + int max_number_entries() const { return m_max_particles; } //!< Block size +diff --git a/include/HepMC3/HEPEVT_Wrapper_Template.h b/include/HepMC3/HEPEVT_Wrapper_Template.h +index 0761596..7571097 100644 +--- a/include/HepMC3/HEPEVT_Wrapper_Template.h ++++ b/include/HepMC3/HEPEVT_Wrapper_Template.h +@@ -59,8 +59,8 @@ private: + // Accessors + // + public: +- void allocate_internal_storage(); ///!< Allocates m_internal_storage storage in smart pointer to hold HEPEVT of fixed size +- void copy_to_internal_storage(char *c, int N); ///!< Copies the content of foreight common block into the internal storage ++ void allocate_internal_storage(); //!< Allocates m_internal_storage storage in smart pointer to hold HEPEVT of fixed size ++ void copy_to_internal_storage( char *c, int N ); //!< Copies the content of foreight common block into the internal storage + void set_max_number_entries( unsigned int size ) { if (size != max_particles) printf("This implementation does not support change of the block size.\n"); assert(size == max_particles); }//!< Set block size + void set_hepevt_address(char *c) { m_hepevtptr = (struct HEPEVT_Templated<max_particles, momentum_type>*)c; } //!< Set Fortran block address + int max_number_entries() const { return max_particles; } //!< Block size +-- +2.35.1 + diff --git a/HepMC3-endian.patch b/HepMC3-endian.patch new file mode 100644 index 0000000..c015788 --- /dev/null +++ b/HepMC3-endian.patch @@ -0,0 +1,57 @@ +From 0aff73ff0236612903ed02e5aad9e524f9382022 Mon Sep 17 00:00:00 2001 +From: Mattias Ellert <mattias.ellert(a)physics.uu.se> +Date: Tue, 22 Feb 2022 09:24:49 +0100 +Subject: [PATCH] Fix test failures on big endian architectures (s390x) + +97% tests passed, 2 tests failed out of 70 +Total Test time (real) = 150.69 sec +The following tests FAILED: + 20 - testHEPEVTWrapper1 (Failed) + 55 - memcheck_testHEPEVTWrapper1 (Failed) +Errors while running CTest +error: Bad exit status from /var/tmp/rpm-tmp.vsrbYS (%check) + +18/70 Test #20: testHEPEVTWrapper1 ...........................***Failed 0.01 sec + Event No.: 0 + Nr Type Parent(s) Daughter(s) Px Py Pz E Inv. M. + 1 1 0 - 0 0 - 0 0.75 -1.57 32.19 32.24 0.06 +[ ... ] + 65 2212 18 - 18 0 - 0 0.00 0.00 7000.45 7000.00 -79.37 +Run comparison +Run comparison +3/3-th strings are not equal testHEPEVTWrapper1output2.txt testHEPEVTWrapper1output3.txt + ->E 0 32 65<- + ->E 0 0 0<- +Run comparison +3/3-th strings are not equal testHEPEVTWrapper1output3.txt testHEPEVTWrapper1output4.txt + ->E 0 0 0<- + ->E 0 32 65<- +Run comparison +Run comparison + +This will also fix issues on little endian architectures if nevhep or +nhep is > 255, since the old code only considered the least +significant byte in that case. +--- + include/HepMC3/HEPEVT_Wrapper_Template.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/HepMC3/HEPEVT_Wrapper_Template.h b/include/HepMC3/HEPEVT_Wrapper_Template.h +index 0761596..ac11dd7 100644 +--- a/include/HepMC3/HEPEVT_Wrapper_Template.h ++++ b/include/HepMC3/HEPEVT_Wrapper_Template.h +@@ -137,9 +137,9 @@ void HEPEVT_Wrapper_Template<max_particles, momentum_type>::copy_to_internal_sto + m_internal_storage = std::make_shared<struct HEPEVT_Templated<max_particles, momentum_type>>(); + m_hepevtptr = m_internal_storage.get(); + char* x = c; +- m_hepevtptr->nevhep=(int)(*x); ++ m_hepevtptr->nevhep = *((int*)x); + x += sizeof(int); +- m_hepevtptr->nhep=(int)(*x); ++ m_hepevtptr->nhep = *((int*)x); + x += sizeof(int); + memcpy(m_hepevtptr->isthep, x, N*sizeof(int)); + x += sizeof(int)*N; +-- +2.35.1 + diff --git a/HepMC3-pythia8-version.patch b/HepMC3-pythia8-version.patch new file mode 100644 index 0000000..7f9f447 --- /dev/null +++ b/HepMC3-pythia8-version.patch @@ -0,0 +1,54 @@ +From ae5f9273b32dbe25fdb4c60490f4b82e961b16f8 Mon Sep 17 00:00:00 2001 +From: Mattias Ellert <mattias.ellert(a)physics.uu.se> +Date: Mon, 21 Feb 2022 21:54:39 +0100 +Subject: [PATCH] Use the correct CMake variable name for PYTHIA8_VERSION + +-- Found Pythia8: /usr/include (found suitable version "8.306", minimum required is "8.220") +-- HepMC3 test: Pythia8 package found. /usr/lib64/libpythia8.so 8.306 +-- HepMC3 test: WARNING: Will use deprecated built-in HepMC3 interface for Pythia8. + +With this change the warning about using the deprecated built-in +version disappears. +--- + examples/Pythia8Example/CMakeLists.txt | 4 ++-- + test/CMakeLists.txt | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/examples/Pythia8Example/CMakeLists.txt b/examples/Pythia8Example/CMakeLists.txt +index c02dd96..695ceb9 100644 +--- a/examples/Pythia8Example/CMakeLists.txt ++++ b/examples/Pythia8Example/CMakeLists.txt +@@ -5,7 +5,7 @@ if (USE_INSTALLED_HEPMC3) + if(Pythia8_FOUND) + message(STATUS "HepMC3 Pythia8Example: Pythia8 package found. pythia8_example enabled") + add_executable(pythia8_example.exe ${CMAKE_CURRENT_SOURCE_DIR}/pythia8_example.cc ) +- if (Pythia8_VERSION VERSION_GREATER "8.300") ++ if (PYTHIA8_VERSION VERSION_GREATER "8.300") + target_compile_definitions(pythia8_example.exe PRIVATE "-DHEPMC3_USE_INTERFACE_FROM_PYTHIA8") + target_include_directories(pythia8_example.exe PRIVATE ${PYTHIA8_INCLUDE_DIR}) + else() +@@ -19,7 +19,7 @@ else() + if(Pythia8_FOUND) + message(STATUS "HepMC3 Pythia8Example: Pythia8 package found. pythia8_example enabled") + add_executable(pythia8_example.exe ${CMAKE_CURRENT_SOURCE_DIR}/pythia8_example.cc ) +- if (Pythia8_VERSION VERSION_GREATER "8.300") ++ if (PYTHIA8_VERSION VERSION_GREATER "8.300") + target_compile_definitions(pythia8_example.exe PRIVATE "-DHEPMC3_USE_INTERFACE_FROM_PYTHIA8") + target_include_directories(pythia8_example.exe PRIVATE ${PYTHIA8_INCLUDE_DIR}) + else() +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index a8eb3b1..bd049a8 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -272,7 +272,7 @@ else() + list( APPEND libMCEG_sources "PythiaValidationTool.cc" ) + list( APPEND libMCEG_link_libraries_HEPMC2 "${PYTHIA8_LIBRARIES}") + list( APPEND libMCEG_link_libraries_HEPMC3 "${PYTHIA8_LIBRARIES}") +- if (Pythia8_VERSION VERSION_GREATER "8.300") ++ if (PYTHIA8_VERSION VERSION_GREATER "8.300") + list( APPEND libMCEG_compile_definitions "-DHEPMC3_USE_INTERFACE_FROM_PYTHIA8") + else() + message(STATUS "HepMC3 test: WARNING: Will use deprecated built-in HepMC3 interface for Pythia8.") +-- +2.35.1 + diff --git a/HepMC3.spec b/HepMC3.spec index 8be53d1..b92023d 100644 --- a/HepMC3.spec +++ b/HepMC3.spec @@ -3,7 +3,7 @@ Name: HepMC3 Version: 3.2.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C++ Event Record for Monte Carlo Generators # HepMC3 itself is GPLv3+ @@ -11,6 +11,15 @@ Summary: C++ Event Record for Monte Carlo Generators License: GPLv3+ and MPLv2.0 URL: https://hepmc.web.cern.ch/hepmc/ Source0: https://hepmc.web.cern.ch/hepmc/releases/%{name}-%{version}.tar.gz +# Use the correct CMake variable name for PYTHIA8_VERSION +# https://gitlab.cern.ch/hepmc/HepMC3/-/merge_requests/166 +Patch0: %{name}-pythia8-version.patch +# Fix test failures on big endian architectures (s390x) +# https://gitlab.cern.ch/hepmc/HepMC3/-/merge_requests/167 +Patch1: %{name}-endian.patch +# Fix doxygen markup +# https://gitlab.cern.ch/hepmc/HepMC3/-/merge_requests/168 +Patch2: %{name}-dox.patch # The ROOT cmake file used by this project requires cmake 3.9 %if %{?rhel}%{!?rhel:0} == 7 @@ -186,6 +195,9 @@ This package provides HepMC manuals and examples. %prep %setup -q +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build %cmake3 \ @@ -388,6 +400,11 @@ rm %{buildroot}%{_includedir}/%{name}/bxzstr/LICENSE %license COPYING %changelog +* Tue Feb 22 2022 Mattias Ellert <mattias.ellert(a)physics.uu.se> - 3.2.5-2 +- Fix detection of installed Pythia HepMC3 interface +- Fix endian issue in HEPEVT wrappers +- Fix doxygen markup syntax + * Mon Feb 21 2022 Mattias Ellert <mattias.ellert(a)physics.uu.se> - 3.2.5-1 - Update to version 3.2.5 - Update License tag for bxzstr https://src.fedoraproject.org/rpms/HepMC3/c/57709be0724426354a8d4a23b4aadcf…

1 0

amigadave pushed to supertux (rawhide). "Add build fix (..more)"
by notifications＠fedoraproject.org 01 Mar '22

01 Mar '22

Notification time stamped 2022-02-22 10:07:56 UTC From 2d3f781f33c673fda30db70749e4261a8bd020c1 Mon Sep 17 00:00:00 2001 From: David King <amigadave(a)amigadave.com> Date: Feb 22 2022 10:07:20 +0000 Subject: Add build fix https://bugzilla.redhat.com/show_bug.cgi?id=2056887 --- diff --git a/supertux-0.6.3-build-fix.patch b/supertux-0.6.3-build-fix.patch new file mode 100644 index 0000000..74ed3b2 --- /dev/null +++ b/supertux-0.6.3-build-fix.patch @@ -0,0 +1,10 @@ +--- /external/partio_zip/zip_manager.hpp 2021-12-22 18:01:58.000000000 -0500 ++++ /external/partio_zip/zip_manager.hpp 2022-02-22 04:16:37.934781613 -0500 +@@ -41,6 +41,7 @@ + #ifndef __ZIP__ + #define __ZIP__ + ++#include <memory> + #include <fstream> + #include <iostream> + #include <map> diff --git a/supertux.spec b/supertux.spec index bf3e57f..1e3e2cf 100644 --- a/supertux.spec +++ b/supertux.spec @@ -8,6 +8,8 @@ Summary: Jump'n run like game License: GPLv2+ URL: https://www.supertux.org Source0: https://github.com/SuperTux/%{name}/releases/download/v%{version}/%{_tarnam… +# https://bugzilla.redhat.com/show_bug.cgi?id=2056887 +Patch0: supertux-0.6.3-build-fix.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1833368 ExcludeArch: s390x https://src.fedoraproject.org/rpms/supertux/c/2d3f781f33c673fda30db70749e42…

1 0

tagoh pushed to gfs-decker-fonts (rawhide). "Get rid of warning message about source_name"
by notifications＠fedoraproject.org 01 Mar '22

01 Mar '22

Notification time stamped 2022-02-22 10:07:23 UTC From 64a662391acb41f29b99b14bc6909779cbb663af Mon Sep 17 00:00:00 2001 From: Akira TAGOH <akira(a)tagoh.org> Date: Feb 22 2022 10:07:14 +0000 Subject: Get rid of warning message about source_name --- diff --git a/gfs-decker-fonts.spec b/gfs-decker-fonts.spec index 31b4869..0820b32 100644 --- a/gfs-decker-fonts.spec +++ b/gfs-decker-fonts.spec @@ -36,7 +36,7 @@ Source10: 61-%{fontpkgname}.xml %fontpkg -%new_package doc +%package doc Summary: Optional documentation files of %{name} BuildArch: noarch %description doc https://src.fedoraproject.org/rpms/gfs-decker-fonts/c/64a662391acb41f29b99b…

1 0

pghmcfc pushed to tidyp (rawhide). "Retired upstream (..more)"
by notifications＠fedoraproject.org 01 Mar '22

01 Mar '22

Notification time stamped 2022-02-22 10:05:35 UTC From 1edc829b1e0fd533e58a1adb3937732d588e36a0 Mon Sep 17 00:00:00 2001 From: Paul Howarth <paul(a)city-fan.org> Date: Feb 22 2022 10:05:29 +0000 Subject: Retired upstream The upstream maintainer has stopped work on tidyp, and has archived the upstream repository in a read-only state: https://github.com/petdance/tidyp The tidyp package existed to be a back-end of perl-HTML-Tidy, which has also stopped development upstream: https://github.com/petdance/html-tidy The perl-HTML-Tidy package has also been retired in Fedora. --- diff --git a/.gitignore b/.gitignore deleted file mode 100644 index eb3382d..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/tidyp-1.02.tar.gz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..38d673e --- /dev/null +++ b/dead.package @@ -0,0 +1,8 @@ +Retired upstream + +The upstream maintainer has stopped work on tidyp, and has archived the +upstream repository in a read-only state: https://github.com/petdance/tidyp + +The tidyp package existed to be a back-end of perl-HTML-Tidy, which has +also stopped development upstream: https://github.com/petdance/html-tidy +The perl-HTML-Tidy package has also been retired in Fedora. diff --git a/sources b/sources deleted file mode 100644 index dc37389..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -4fc6f0ba8fb1e2ffafbf8f5963f58969 tidyp-1.02.tar.gz diff --git a/tidy-outfile-raw.patch b/tidy-outfile-raw.patch deleted file mode 100644 index 0cac5a0..0000000 --- a/tidy-outfile-raw.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- tidy/src/config.c.orig 2008-06-18 21:18:54.000000000 +0100 -+++ tidy/src/config.c 2011-07-26 13:19:45.688344233 +0100 -@@ -919,7 +919,10 @@ - TidyBuffer inbuf; /* Set up input source */ - tidyBufInitWithAllocator( &inbuf, doc->allocator ); - tidyBufAttach( &inbuf, (byte*)optval, TY_(tmbstrlen)(optval)+1 ); -- doc->config.cfgIn = TY_(BufferInput)( doc, &inbuf, ASCII ); -+ if (optId == TidyOutFile) -+ doc->config.cfgIn = TY_(BufferInput)( doc, &inbuf, RAW ); -+ else -+ doc->config.cfgIn = TY_(BufferInput)( doc, &inbuf, ASCII ); - doc->config.c = GetC( &doc->config ); - - status = option->parser( doc, option ); diff --git a/tidyp-1.02-format.patch b/tidyp-1.02-format.patch deleted file mode 100644 index 9a509cf..0000000 --- a/tidyp-1.02-format.patch +++ /dev/null @@ -1,72 +0,0 @@ -https://github.com/w3c/tidy-html5/issues/11 -https://github.com/w3c/tidy-html5/pull/12 - -From 8727af8a7c8a2d11743bb6d35f07f4a21ade7266 Mon Sep 17 00:00:00 2001 -From: John Schember <john(a)nachtimwald.com> -Date: Sun, 26 Feb 2012 11:53:53 -0500 -Subject: [PATCH] Fix format string warnings. - ---- - src/localize.c | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/localize.c b/src/localize.c -index 1b95923..9823f12 100644 ---- a/src/localize.c -+++ b/src/localize.c -@@ -1373,14 +1373,14 @@ void TY_(ReportAccessWarning)( TidyDocImpl* doc, Node* node, uint code ) - { - ctmbstr fmt = GetFormatFromCode(code); - doc->badAccess |= BA_WAI; -- messageNode( doc, TidyAccess, node, fmt ); -+ messageNode( doc, TidyAccess, node, "%s", fmt ); - } - - void TY_(ReportAccessError)( TidyDocImpl* doc, Node* node, uint code ) - { - ctmbstr fmt = GetFormatFromCode(code); - doc->badAccess |= BA_WAI; -- messageNode( doc, TidyAccess, node, fmt ); -+ messageNode( doc, TidyAccess, node, "%s", fmt ); - } - - #endif /* SUPPORT_ACCESSIBILITY_CHECKS */ -@@ -1399,7 +1399,7 @@ void TY_(ReportWarning)(TidyDocImpl* doc, Node *element, Node *node, uint code) - switch (code) - { - case NESTED_QUOTATION: -- messageNode(doc, TidyWarning, rpt, fmt); -+ messageNode(doc, TidyWarning, rpt, "%s", fmt); - break; - - case OBSOLETE_ELEMENT: -@@ -1480,7 +1480,7 @@ void TY_(ReportError)(TidyDocImpl* doc, Node *element, Node *node, uint code) - case INCONSISTENT_NAMESPACE: - case DOCTYPE_AFTER_TAGS: - case DTYPE_NOT_UPPER_CASE: -- messageNode(doc, TidyWarning, rpt, fmt); -+ messageNode(doc, TidyWarning, rpt, "%s", fmt); - break; - - case COERCE_TO_ENDTAG: -@@ -1499,7 +1499,7 @@ void TY_(ReportError)(TidyDocImpl* doc, Node *element, Node *node, uint code) - case ENCODING_IO_CONFLICT: - case MISSING_DOCTYPE: - case SPACE_PRECEDING_XMLDECL: -- messageNode(doc, TidyWarning, node, fmt); -+ messageNode(doc, TidyWarning, node, "%s", fmt); - break; - - case TRIM_EMPTY_ELEMENT: -@@ -1548,7 +1548,7 @@ void TY_(ReportFatal)( TidyDocImpl* doc, Node *element, Node *node, uint code) - { - case SUSPECTED_MISSING_QUOTE: - case DUPLICATE_FRAMESET: -- messageNode(doc, TidyError, rpt, fmt); -+ messageNode(doc, TidyError, rpt, "%s", fmt); - break; - - case UNKNOWN_ELEMENT: --- -1.8.4 - diff --git a/tidyp-1.04-aarch64.patch b/tidyp-1.04-aarch64.patch deleted file mode 100644 index e4d3557..0000000 --- a/tidyp-1.04-aarch64.patch +++ /dev/null @@ -1,36 +0,0 @@ -Add aarch64 support (http://bugzilla.redhat.com/926635) - ---- config.guess -+++ config.guess -@@ -808,6 +808,13 @@ EOF - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix - exit 0 ;; -+ aarch64:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit 0 ;; -+ aarch64_be:Linux:*:*) -+ UNAME_MACHINE=aarch64_be -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit 0 ;; - arm*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; ---- config.sub -+++ config.sub -@@ -226,6 +226,7 @@ case $basic_machine in - # Some are omitted here because they have special meanings below. - 1750a | 580 \ - | a29k \ -+ | aarch64 | aarch64_be \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ -@@ -291,6 +292,7 @@ case $basic_machine in - # Recognize the basic CPU types with company name. - 580-* \ - | a29k-* \ -+ | aarch64-* | aarch64_be-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ diff --git a/tidyp-cflags.patch b/tidyp-cflags.patch deleted file mode 100644 index 62a9fa3..0000000 --- a/tidyp-cflags.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- tidyp-1.00/configure.ac 2010-04-25 06:25:59.000000000 +0100 -+++ tidyp-1.00/configure.ac 2010-04-26 11:19:26.379099622 +0100 -@@ -62,7 +62,7 @@ - if test $debug_build = yes; then - CFLAGS="$save_cflags -g" - else -- CFLAGS="-O2 $save_cflags" -+ CFLAGS="$save_cflags" - fi - # - # ============================================= ---- tidyp-0.99/configure 2010-02-22 06:25:50.000000000 +0000 -+++ tidyp-0.99/configure 2010-03-01 14:39:35.461711475 +0000 -@@ -3110,7 +3110,7 @@ - if test $debug_build = yes; then - CFLAGS="$save_cflags -g" - else -- CFLAGS="-O2 $save_cflags" -+ CFLAGS="$save_cflags" - fi - # - # ============================================= diff --git a/tidyp.spec b/tidyp.spec deleted file mode 100644 index 1814f73..0000000 --- a/tidyp.spec +++ /dev/null @@ -1,284 +0,0 @@ -Summary: Clean up and pretty-print HTML/XHTML/XML -Name: tidyp -Version: 1.02 -Release: 29%{?dist} -License: W3C -Url: http://www.tidyp.com/ -Source0: http://github.com/downloads/petdance/tidyp/tidyp-%{version}.tar.gz -Patch0: tidy-outfile-raw.patch -Patch1: tidyp-cflags.patch -Patch2: tidyp-1.04-aarch64.patch -Patch3: tidyp-1.02-format.patch -BuildRequires: coreutils -BuildRequires: gcc -BuildRequires: make -BuildRequires: sed -Requires: libtidyp%{?_isa} = %{version}-%{release} - -%description -tidyp is a fork of tidy on SourceForge. The library name is "tidyp", and the -command-line tool is also "tidyp" but all internal API stays the same. - -%package -n libtidyp -Summary: Shared libraries for tidyp - -%description -n libtidyp -Shared libraries for tidyp. - -%package -n libtidyp-devel -Summary: Development files for libtidyp -Requires: libtidyp%{?_isa} = %{version}-%{release} - -%description -n libtidyp-devel -Development files for libtidyp. - -%prep -%setup -q - -# Fix mangling of output file names (#725651) -# Sent upstream: https://github.com/petdance/tidyp/pull/18 -%patch0 -p1 - -# Remove unwanted CFLAGS -%patch1 -p1 - -# Tweak config.guess and config.sub to add aarch64 support (#926635) -%patch2 - -# Fix format string issues -# https://github.com/w3c/tidy-html5/issues/11 -%patch3 -p1 - -# Fix permissions for debuginfo -chmod -x src/{mappedio.*,version.h} - -# Fix timestamp order to avoid trying to re-run autotools -touch aclocal.m4 -find . -name Makefile.in -exec touch {} \; -touch configure - -%build -%configure --disable-static --disable-dependency-tracking - -# Remove RPATH to libdir -sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool -sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool - -%{make_build} - -%install -%{make_install} - -%check -make check - -%ldconfig_scriptlets - -%files -%doc ChangeLog README -%{_bindir}/tidyp - -%files -n libtidyp -%{_libdir}/libtidyp-%{version}.so.0* - -%files -n libtidyp-devel -%{_includedir}/tidyp/ -%{_libdir}/libtidyp.so -%exclude %{_libdir}/libtidyp.la - -%changelog -* Sat Jan 22 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.02-29 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Sun Jul 25 2021 Paul Howarth <paul(a)city-fan.org> - 1.02-28 -- Use %%{make_build} and %%{make_install} -- Remove RPATH to libdir - -* Fri Jul 23 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.02-27 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.02-26 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.02-25 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jan 31 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.02-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.02-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.02-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.02-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Feb 6 2018 Paul Howarth <paul(a)city-fan.org> - 1.02-20 -- Switch to %%ldconfig_scriptlets -- Drop legacy BuildRoot: and Group: tags -- Drop redundant explicit buildroot cleaning - -* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.02-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.02-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.02-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Feb 05 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.02-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Jan 26 2016 Paul Howarth <paul(a)city-fan.org> - 1.02-15 -- Drop %%defattr, redundant since rpm 4.4 - -* Fri Jun 19 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.02-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Aug 18 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.02-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.02-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu Nov 21 2013 Paul Howarth <paul(a)city-fan.org> 1.02-11 -- fix format string issues (https://github.com/w3c/tidy-html5/issues/11) - -* Sun Aug 4 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> 1.02-10 -- rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Mon Mar 25 2013 Paul Howarth <paul(a)city-fan.org> 1.02-9 -- tweak config.guess and config.sub to add aarch64 support (#926635) - -* Fri Feb 15 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> 1.02-8 -- rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sat Jul 21 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> 1.02-7 -- rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Wed Jan 11 2012 Paul Howarth <paul(a)city-fan.org> 1.02-6 -- rebuilt for gcc 4.7 in Rawhide - -* Thu Aug 11 2011 Paul Howarth <paul(a)city-fan.org> 1.02-5 -- fix mangling of output file names (#725651) - -* Wed Feb 9 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> 1.02-4 -- rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Wed Sep 29 2010 Jesse Keating <jkeating(a)redhat.com> 1.02-3 -- rebuilt for gcc bug (#634757) - -* Fri Jul 23 2010 Paul Howarth <paul(a)city-fan.org> 1.02-2 -- re-jig for Fedora submission -- add ChangeLog and README as %%doc -- upstream URL now http://www.tidyp.com/ -- drop obsolete of old libtidyp versions in main package - -* Mon May 10 2010 Paul Howarth <paul(a)city-fan.org> 1.02-1 -- update to 1.02 - - metatag check fixed - - missing files for "make check" included -- drop upstreamed metatag patch -- fix dist tag for RHEL-6 Beta -- touch autotools-generated files in order to prevent attempted - re-running of autotools at build time - -* Mon Apr 26 2010 Paul Howarth <paul(a)city-fan.org> 1.00-1 -- update to 1.00 - - removed -Wextra compiler flag for gcc, incompatible with older versions - - added "check" and "tags" make targets - - removed commented-out code -- add %%check section, using test data from upstream git since it was omitted - from the distribution tarball -- drop upstreamed parts of patches -- merge autotools patch into cflags patch -- add patch to update "generator" metatag properly - -* Mon Mar 1 2010 Paul Howarth <paul(a)city-fan.org> 0.99-2 -- main package renamed to tidyp, as per upstream -- new subpackage libtidyp (same split as tidy in Fedora) -- upstream has now provided a proper tarball, with pre-built configure script, - so rework build system patches and drop autotools buildreqs -- reworked upstream tarball no longer includes docs - -* Wed Feb 17 2010 Paul Howarth <paul(a)city-fan.org> 0.99-1 -- libtidyp forked from tidy -- add patches to autotools build to make it work more sanely - -* Tue Dec 8 2009 Paul Howarth <paul(a)city-fan.org> 0.99.0-20.20091203.1 -- 20091203 snapshot -- spec housecleaning -- tidy erroneously removed whitespace, causing mangled text (#481350) - -* Fri Jul 31 2009 Paul Howarth <paul(a)city-fan.org> 0.99.0-19.20070615.1 -- rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Tue Mar 3 2009 Paul Howarth <paul(a)city-fan.org> 0.99.0-18.20070615.1 -- rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Tue Feb 19 2008 Paul Howarth <paul(a)city-fan.org> 0.99.0-17.20070615.1 -- respin (gcc 4.3.0) - -* Mon Aug 27 2007 Paul Howarth <paul(a)city-fan.org> 0.99.0-16.20070615.1 -- respin (BuildID) - -* Fri Aug 24 2007 Paul Howarth <paul(a)city-fan.org> 0.99.0-15.20070615.1 -- use standard shortname "WSC" for license tag - -* Tue Jul 10 2007 Paul Howarth <paul(a)city-fan.org> 0.99.0-13.20070615.1 -- 15th June 2007 snapshot - -* Mon Jun 25 2007 Paul Howarth <paul(a)city-fan.org> 0.99.0-12.20070228.1 -- upstream has stopped releasing tarballs and advocates CVS snapshots - instead -- 28th February 2007 snapshot -- run setup.sh in %%prep rather than %%build -- fileio.h no longer included in -devel package - -* Fri Sep 15 2006 Paul Howarth <paul(a)city-fan.org> 0.99.0-10.20051026 -- add dist tag - -* Tue Jun 20 2006 Paul Howarth <paul(a)city-fan.org> 0.99.0-9.20051026.4 -- libtidy-devel depends on libtidy, not tidy - -* Mon Jan 23 2006 Paul Howarth <paul(a)city-fan.org> 0.99.0-9.20051026 -- Update source to 26 October 2005 version -- Bring back libtidy as per Fedora Extras package -- Never strip binaries - -* Fri Oct 21 2005 Paul Howarth <paul(a)city-fan.org> 0.99.0-6.20051020 -- Drop obsoletes/provides for libtidy-progs, which didn't work anyway -- Update to 051020 releases of both src and docs -- Remove buildroot unconditionally in %%clean and %%install -- Don't use macros for pathnames in build-time commands, hardcode them instead -- Wrap %%description at 80 columns - -* Tue Aug 9 2005 Paul Howarth <paul(a)city-fan.org> 0.99.0-6.20050803 -- Clean up doc generation -- Build quickref.html -- Strip binaries if we're not making a debuginfo package - -* Tue Aug 9 2005 Paul Howarth <paul(a)city-fan.org> 0.99.0-5.20050803 -- Update to 050803 and docs to 050705 -- Rename packages *again* to be compatible with Fedora Extras - -* Thu Jun 2 2005 Paul Howarth <paul(a)city-fan.org> 0.99.0-5.20050531 -- Update to 050531 version -- Incorporate documentation, version 050502 -- Rename/reversion package for Fedora Extras compatibility -- Exclude libtidy.la, not needed - -* Tue Feb 01 2005 Paul Howarth <paul(a)city-fan.org> -- Update to 050120 version - -* Wed Oct 27 2004 Paul Howarth <paul(a)city-fan.org> -- Update to 041026 version - -* Tue Jul 20 2004 Paul Howarth <paul(a)city-fan.org> -- Update to 040706 version - -* Thu May 13 2004 Paul Howarth <paul(a)city-fan.org> -- Initial RPM build https://src.fedoraproject.org/rpms/tidyp/c/1edc829b1e0fd533e58a1adb3937732d…

1 0

Jump to page: