public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Laurent Rineau <laurent.rineau@cgal.org>
To: git-commits@fedoraproject.org
Subject: [rpms/CGAL] rawhide: Merge branch 'main' into rawhide
Date: Fri, 12 Jun 2026 10:38:16 GMT	[thread overview]
Message-ID: <178126069630.1.5465673301554026290.rpms-CGAL-da48659d9732@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/CGAL
            Branch : rawhide
            Commit : da48659d9732cbd37e09d11680af16eb1ae2aadc
            Author : Laurent Rineau <laurent.rineau@cgal.org>
            Date   : 2026-06-12T12:34:08+02:00
            Stats  : +14/-7 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/CGAL/c/da48659d9732cbd37e09d11680af16eb1ae2aadc?branch=rawhide

            Log:
            Merge branch 'main' into rawhide

# Conflicts:
#	CGAL.spec

---
diff --git a/.packit.yaml b/.packit.yaml
index 882d3e7..c0be806 100644
--- a/.packit.yaml
+++ b/.packit.yaml
@@ -2,6 +2,8 @@
 # https://packit.dev/docs/configuration/
 
 upstream_project_url: https://github.com/CGAL/cgal
+downstream_package_name: CGAL
+upstream_tag_template: v{version}
 jobs:
   - job: pull_from_upstream
     trigger: release

diff --git a/CGAL.spec b/CGAL.spec
index ab17c67..12a4c53 100644
--- a/CGAL.spec
+++ b/CGAL.spec
@@ -6,17 +6,19 @@
 %global qt_version 6.4
 %global cmake_version 3.22
 
-#%%global fullversion %%{version}
-%global fullversion 6.2-beta1
+%global base_version 6.2
+#global prerelease beta1
+%global package_version %{base_version}%{?prerelease:~%{prerelease}}
+%global upstream_version %{base_version}%{?prerelease:-%{prerelease}}
 
 Name:           CGAL
-Version:        6.2
-Release:        1%{?dist}
+Version:        %{package_version}
+Release:        %autorelease
 Summary:        Computational Geometry Algorithms Library
 
 License:        LGPL-3.0-or-later AND GPL-3.0-or-later AND BSL-1.0
 URL:            http://www.cgal.org/
-Source0:        https://github.com/CGAL/cgal/releases/download/v%{fullversion}/%{name}-%{fullversion}.tar.xz
+Source0:        https://github.com/CGAL/cgal/releases/download/v%{upstream_version}/%{name}-%{upstream_version}.tar.xz
 
 # Required devel packages.
 BuildRequires: cmake >= %{cmake_version}
@@ -82,7 +84,7 @@ CGAL algorithms.
 
 
 %prep
-%autosetup -p1 -n %{name}-%{fullversion}
+%autosetup -p1 -n %{name}-%{upstream_version}
 
 # Fix some file permissions
 #chmod a-x include/CGAL/export/ImageIO.h

diff --git a/CGAL.spec b/CGAL.spec
index bf34d51..12a4c53 100644
--- a/CGAL.spec
+++ b/CGAL.spec
@@ -7,7 +7,7 @@
 %global cmake_version 3.22
 
 %global base_version 6.2
-%global prerelease beta1
+#global prerelease beta1
 %global package_version %{base_version}%{?prerelease:~%{prerelease}}
 %global upstream_version %{base_version}%{?prerelease:-%{prerelease}}
 

diff --git a/README.packit b/README.packit
new file mode 100644
index 0000000..af5832b
--- /dev/null
+++ b/README.packit
@@ -0,0 +1,3 @@
+This repository is maintained by packit.
+https://packit.dev/
+The file was generated using packit 1.16.0.

                 reply	other threads:[~2026-06-12 10:38 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178126069630.1.5465673301554026290.rpms-CGAL-da48659d9732@fedoraproject.org \
    --to=laurent.rineau@cgal.org \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox