[packit] 8.13.31 upstream release

- Resolves rhbz#2265930

Upstream tag: v8.13.31
Upstream commit: e47049b1

.packit.yaml

@@ -0,0 +1,30 @@
+specfile_path: libphonenumber.spec
+
+# name in upstream package repository or registry (e.g. in PyPI)
+upstream_package_name: libphonenumber
+upstream_project_url: https://github.com/google/libphonenumber
+# downstream (Fedora) RPM package name
+downstream_package_name: libphonenumber
+issue_repository: https://src.fedoraproject.org/rpms/libphonenumber
+
+upload_sources: true
+upstream_tag_template: v{version}
+
+jobs:
+  - job: pull_from_upstream
+    trigger: release
+    dist_git_branches:
+      - fedora-rawhide
+
+  - job: koji_build
+    trigger: commit
+    allowed_pr_authors: ["packit", "sergiomb"]
+    allowed_committers: ["packit", "sergiomb"]
+    dist_git_branches:
+      - fedora-latest
+      - fedora-rawhide
+
+  - job: bodhi_update
+    trigger: commit
+    dist_git_branches:
+      - fedora-latest # rawhide updates are created automatically

README.packit

@@ -0,0 +1,3 @@
+This repository is maintained by packit.
+https://packit.dev/
+The file was generated using packit 0.92.0.

libphonenumber-8.13.27-new-protobuf-cmake-logic.patch

@@ -0,0 +1,176 @@
+diff -up libphonenumber-8.13.27/cpp/cmake/config.cmake.in.3213 libphonenumber-8.13.27/cpp/cmake/config.cmake.in
+--- libphonenumber-8.13.27/cpp/cmake/config.cmake.in.3213	2023-12-07 01:58:20.000000000 -0500
++++ libphonenumber-8.13.27/cpp/cmake/config.cmake.in	2024-01-16 09:52:09.617694098 -0500
+@@ -2,8 +2,8 @@
+ 
+ include(CMakeFindDependencyMacro)
+ 
+-find_dependency(absl)
+-find_dependency(Protobuf)
++find_dependency(absl CONFIG)
++find_dependency(Protobuf CONFIG)
+ 
+ include("${CMAKE_CURRENT_LIST_DIR}/@targets_export_name@.cmake")
+ check_required_components("@PROJECT_NAME@")
+diff -up libphonenumber-8.13.27/cpp/CMakeLists.txt.3213 libphonenumber-8.13.27/cpp/CMakeLists.txt
+--- libphonenumber-8.13.27/cpp/CMakeLists.txt.3213	2024-01-16 09:51:54.097535141 -0500
++++ libphonenumber-8.13.27/cpp/CMakeLists.txt	2024-01-16 10:04:50.017558082 -0500
+@@ -100,7 +100,8 @@ if (USE_ALTERNATE_FORMATS)
+ endif ()
+ 
+ # Find all the required libraries and programs.
+-find_package(absl)
++# Use "CONFIG" as there is no built-in cmake module for absl.
++find_package(absl CONFIG REQUIRED)
+ 
+ if(NOT absl_FOUND)
+   # Overide abseil install rules for subprojects
+@@ -169,14 +170,24 @@ if (USE_RE2)
+   find_required_library (RE2 re2/re2.h re2 "Google RE2")
+ endif ()
+ 
+-if (USE_PROTOBUF_LITE)
+-  find_required_library (PROTOBUF google/protobuf/message_lite.h protobuf-lite
+-                         "Google Protocol Buffers")
+-  check_library_version (PC_PROTOBUF protobuf-lite>=2.4)
++find_package(Protobuf CONFIG)
++if(NOT Protobuf_FOUND)
++  find_package(Protobuf REQUIRED)
++endif()
++
++if (${Protobuf_VERSION} VERSION_LESS "3.21.0.0")
++  if (USE_PROTOBUF_LITE)
++    set (PROTOBUF_LIB ${Protobuf_LITE_LIBRARIES})
++  else ()
++    set (PROTOBUF_LIB ${Protobuf_LIBRARIES})
++  endif ()
++# find_required_program (PROTOC protoc "Google Protocol Buffers compiler (protoc)")
+ else ()
+-  find_required_library (PROTOBUF google/protobuf/message_lite.h protobuf
+-                         "Google Protocol Buffers")
+-  check_library_version (PC_PROTOBUF protobuf>=2.4)
++  if (USE_PROTOBUF_LITE)
++    set (PROTOBUF_LIB protobuf::libprotobuf-lite)
++  else ()
++    set (PROTOBUF_LIB protobuf::libprotobuf)
++  endif ()
+ endif ()
+ 
+ find_required_library (ICU_UC unicode/uchar.h icuuc "ICU")
+@@ -192,9 +203,6 @@ if (USE_ICU_REGEXP OR BUILD_GEOCODER)
+   list (APPEND ICU_LIB ${ICU_I18N_LIB})
+ endif ()
+ 
+-find_required_program (PROTOC protoc
+-                       "Google Protocol Buffers compiler (protoc)")
+-
+ if (REGENERATE_METADATA)
+   find_required_program (JAVA java
+                          "Java Runtime Environment")
+@@ -220,24 +228,39 @@ endif ()
+ set (RESOURCES_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../resources")
+ 
+ set (
+-  PROTOBUF_SOURCES "${RESOURCES_DIR}/phonemetadata.proto"
+-                   "${RESOURCES_DIR}/phonenumber.proto"
++  PROTO_FILES "${RESOURCES_DIR}/phonemetadata.proto"
++              "${RESOURCES_DIR}/phonenumber.proto"
+ )
+ 
+-set (
+-  PROTOBUF_OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/src/phonenumbers/phonemetadata.pb.cc"
+-                  "${CMAKE_CURRENT_SOURCE_DIR}/src/phonenumbers/phonemetadata.pb.h"
+-                  "${CMAKE_CURRENT_SOURCE_DIR}/src/phonenumbers/phonenumber.pb.cc"
+-                  "${CMAKE_CURRENT_SOURCE_DIR}/src/phonenumbers/phonenumber.pb.h"
+-)
++if (${Protobuf_VERSION} VERSION_LESS "3.21.0.0")
++  set (
++    PROTOBUF_OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/src/phonenumbers/phonemetadata.pb.cc"
++                    "${CMAKE_CURRENT_SOURCE_DIR}/src/phonenumbers/phonemetadata.pb.h"
++                    "${CMAKE_CURRENT_SOURCE_DIR}/src/phonenumbers/phonenumber.pb.cc"
++                    "${CMAKE_CURRENT_SOURCE_DIR}/src/phonenumbers/phonenumber.pb.h"
++  )
+ 
+-add_custom_command (
+-  COMMAND ${PROTOC_BIN} --cpp_out=${CMAKE_CURRENT_SOURCE_DIR}/src/phonenumbers/
+-    --proto_path=${RESOURCES_DIR} ${PROTOBUF_SOURCES}
++# COMMAND ${PROTOC_BIN}
++  add_custom_command (
++    COMMAND ${Protobuf_PROTOC_EXECUTABLE}
++    ARGS --cpp_out=${CMAKE_CURRENT_SOURCE_DIR}/src/phonenumbers/ --proto_path=${RESOURCES_DIR} ${PROTO_FILES}
++    VERBATIM
+ 
+-  OUTPUT ${PROTOBUF_OUTPUT}
+-  DEPENDS ${PROTOBUF_SOURCES}
+-)
++    OUTPUT ${PROTOBUF_OUTPUT}
++    DEPENDS ${PROTO_FILES}
++  )
++else ()
++  set (PROTOBUF_OUTPUT "")
++  add_library (proto-objects OBJECT ${PROTO_FILES})
++  target_link_libraries (proto-objects PUBLIC protobuf::libprotobuf)
++  set (PROTO_BINARY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src")
++  target_include_directories (proto-objects PUBLIC "$<BUILD_INTERFACE:${PROTO_BINARY_DIR}>")
++  protobuf_generate (
++      TARGET proto-objects
++      IMPORT_DIRS "${RESOURCES_DIR}"
++      PROTOC_OUT_DIR "${PROTO_BINARY_DIR}/phonenumbers"
++  )
++endif ()
+ 
+ if (BUILD_GEOCODER)
+   # Geocoding data cpp file generation
+@@ -267,9 +290,7 @@ set (
+   "src/phonenumbers/base/strings/string_piece.cc"
+   "src/phonenumbers/default_logger.cc"
+   "src/phonenumbers/logger.cc"
+-  "src/phonenumbers/phonemetadata.pb.cc" # Generated by Protocol Buffers.
+   "src/phonenumbers/phonenumber.cc"
+-  "src/phonenumbers/phonenumber.pb.cc"   # Generated by Protocol Buffers.
+   "src/phonenumbers/phonenumberutil.cc"
+   "src/phonenumbers/regex_based_matcher.cc"
+   "src/phonenumbers/regexp_cache.cc"
+@@ -282,6 +303,10 @@ set (
+   "src/phonenumbers/utf/unilib.cc"
+ )
+ 
++if (${Protobuf_VERSION} VERSION_LESS "3.21.0.0")
++  list (APPEND SOURCES ${PROTOBUF_OUTPUT})
++endif ()
++
+ if (BUILD_GEOCODER)
+   set (
+     GEOCODING_SOURCES
+@@ -290,7 +315,6 @@ if (BUILD_GEOCODER)
+     "src/phonenumbers/geocoding/geocoding_data.cc"
+     "src/phonenumbers/geocoding/mapping_file_provider.cc"
+     "src/phonenumbers/geocoding/phonenumber_offline_geocoder.cc"
+-    "src/phonenumbers/phonenumber.pb.h"  # Forces proto buffer generation.
+   )
+ endif ()
+ 
+@@ -450,6 +474,10 @@ if (APPLE)
+   list (APPEND LIBRARY_DEPS ${COREFOUNDATION_LIB} ${FOUNDATION_LIB})
+ endif ()
+ 
++if (${Protobuf_VERSION} VERSION_GREATER_EQUAL "3.21.0.0")
++  list (APPEND LIBRARY_DEPS proto-objects)
++endif ()
++
+ #----------------------------------------------------------------
+ # Build libraries
+ #----------------------------------------------------------------
+@@ -601,7 +629,11 @@ endif()
+ # Install built libraries
+ #----------------------------------------------------------------
+ 
+-set (BUILT_LIBS)
++if (${Protobuf_VERSION} VERSION_GREATER_EQUAL "3.21.0.0")
++  set (BUILT_LIBS proto-objects)
++else ()
++  set (BUILT_LIBS)
++endif ()
+ set(targets_export_name "${PROJECT_NAME}-targets")
+ 
+ if (BUILD_STATIC_LIB)

libphonenumber.spec

@@ -1,11 +1,12 @@
 Name: libphonenumber
-Version: 8.12.57
-Release: 6%{?dist}
+Version: 8.13.31
+Release: 1%{?dist}
 Summary: Library to handle international phone numbers
 # The project itself is ASL 2.0 but contains files from Chromium which are BSD and MIT.
 License: ASL 2.0 and BSD and MIT
 URL: https://github.com/google/libphonenumber/
 Source0: https://github.com/google/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
+Patch1:  libphonenumber-8.13.27-new-protobuf-cmake-logic.patch
 
 BuildRequires: abseil-cpp-devel
 BuildRequires: boost-devel
@@ -46,11 +47,12 @@ sed -r -i 's/\b(CMAKE_CXX_STANDARD[[:blank:]]+)11\b/\117/' \
 %build
 pushd cpp
 %ifarch %{java_arches}
-%cmake
+%cmake \
 %else
 touch src/phonenumbers/test_metadata.h
-%cmake -DREGENERATE_METADATA=OFF
+%cmake -DREGENERATE_METADATA=OFF \
 %endif
+    -DCMAKE_POSITION_INDEPENDENT_CODE=ON
 %cmake_build
 popd
 
@@ -74,9 +76,100 @@ popd
 %{_includedir}/phonenumbers
 %{_libdir}/libgeocoding.so
 %{_libdir}/libphonenumber.so
+%{_libdir}/cmake/libphonenumber/
 
 
 %changelog
+* Sun Feb 25 2024 Packit <hello@packit.dev> - 8.13.31-1
+- [maven-release-plugin] prepare release v8.13.31 (Mandali Reddy)
+- Revert "Kkeshava maven update (#3403)" (#3405) (kkeshava)
+- Update java runtime version to support App Engine (#3404) (mandlil)
+- Kkeshava maven update (#3403) (kkeshava)
+- Metadata updates for release 8.13.31 (#3402) (kkeshava)
+- Mandlil maven update (#3399) (mandlil)
+- Update README.md (#3400) (mandlil)
+- Resolves rhbz#2265930
+
+* Fri Feb 09 2024 Packit <hello@packit.dev> - 8.13.30-1
+- [maven-release-plugin] prepare release v8.13.30 (Mandali Reddy)
+- Metadata updates for release 8.13.30 (#3398) (mandlil)
+- Update README.md (#3397) (kkeshava)
+- Kkeshava maven update (#3396) (kkeshava)
+- Resolves rhbz#2263484
+
+* Sun Feb 04 2024 Benjamin A. Beasley <code@musicinmybrain.net> - 8.13.29-2
+- Rebuilt for abseil-cpp-20240116.0
+
+* Fri Feb 02 2024 Packit <hello@packit.dev> - 8.13.29-1
+- [maven-release-plugin] prepare release v8.13.29 (Kavitha Keshava)
+- Metadata updates for release 8.13.29 (#3395) (kkeshava)
+- Mandlil patch 2 (#3393) (mandlil)
+- Update README.md (#3386) (mandlil)
+- Mandlil maven update (#3385) (mandlil)
+- Resolves rhbz#2258931
+
+* Wed Jan 31 2024 Pete Walter <pwalter@fedoraproject.org> - 8.13.28-7
+- Rebuild for ICU 74
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 8.13.28-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Benjamin A. Beasley <code@musicinmybrain.net> - 8.13.28-5
+- Always build as position-independent code (PIC)
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 8.13.28-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Thu Jan 18 2024 Sérgio Basto <sergio@serjux.com> - 8.13.28-3
+- add support to protobuf 3.25.1
+
+* Thu Jan 18 2024 Jonathan Wakely <jwakely@redhat.com> - 8.13.28-2
+- Rebuild for Boost 1.83.0 again
+
+* Thu Jan 18 2024 Packit <hello@packit.dev> - 8.13.28-1
+- [maven-release-plugin] prepare release v8.13.28 (Mandali Reddy)
+- Metadata updates for release 8.13.28 (#3383) (mandlil)
+- Update README.md (#3356) (mandlil)
+- Mandlil maven update (#3348) (mandlil)
+
+* Thu Jan 18 2024 Jonathan Wakely <jwakely@redhat.com> - 8.13.27-2
+- Rebuilt for Boost 1.83
+
+* Tue Dec 19 2023 Sérgio M. Basto <sergio@serjux.com> - 8.13.27-1
+- [maven-release-plugin] prepare release v8.13.27 (Mandali Reddy)
+- Metadata updates for release 8.13.27 (#3346) (rohininidhi)
+- Replace uses of `int64` with `int64_t` and similar integer type aliases (#3345) (mandlil)
+- Update method phonenumberutil.format to return 'empty' instead of value '0'. (#3305) (mandlil)
+- Update README.md (#3304) (kkeshava)
+- Kkeshava maven update1 (#3303) (kkeshava)
+
+* Sat Sep 02 2023 Sérgio Basto <sergio@serjux.com> - 8.13.19-2
+- We need to build it in the side tag
+
+* Sat Sep 02 2023 Sérgio Basto <sergio@serjux.com> - 8.13.19-1
+- Update libphonenumber to 8.13.19 (#2221771)
+
+* Wed Aug 30 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 8.13.15-4
+- Rebuilt for abseil-cpp 20230802.0
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 8.13.15-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Tue Jul 11 2023 František Zatloukal <fzatlouk@redhat.com> - 8.13.15-2
+- Rebuilt for ICU 73.2
+
+* Fri Jun 23 2023 Fedora Release Monitoring <release-monitoring@fedoraproject.org> - 8.13.15-1
+- Update to 8.13.15 (#2209210)
+
+* Tue May 16 2023 Sérgio Basto <sergio@serjux.com> - 8.13.11-1
+- Update libphonenumber to 8.13.11
+
+* Thu Mar 23 2023 Sérgio Basto <sergio@serjux.com> - 8.12.57-8
+- Rebuilt for abseil-cpp
+
+* Mon Feb 20 2023 Jonathan Wakely <jwakely@redhat.com> - 8.12.57-7
+- Rebuilt for Boost 1.81
+
 * Mon Jan 30 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 8.12.57-6
 - Correctly build as C++17 instead of C++11 for gtest-1.13.0, which needs C++14
 

sources

@@ -1 +1 @@
-SHA512 (libphonenumber-8.12.57.tar.gz) = 390b341ff1872b05be06bb9b0a6db4df8b9df295e737ab555da91f04d0adef56dbb3799be6a343c172bc88fb506489dc7fd0fd0494d45056d010498183fdd8ab
+SHA512 (libphonenumber-8.13.31.tar.gz) = a672304611be3cfba8cc35a6b4ab8e6b84269577803a0517258f019fbd69785e800ce905220d86426d2c1b19debf5ed8d019d9c3e21be47d270f62b692f2f9f9