public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Steve Cossette <farchord@gmail.com>
To: git-commits@fedoraproject.org
Subject: [rpms/timeshift] f43: 25.12.4
Date: Fri, 19 Jun 2026 17:56:43 GMT	[thread overview]
Message-ID: <178189180306.1.5545636443162982212.rpms-timeshift-a77d35bcc7d1@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/timeshift
Branch : f43
Commit : a77d35bcc7d10fe57e1901900e1ebf7226c1a1f5
Author : Steve Cossette <farchord@gmail.com>
Date   : 2026-06-19T13:51:45-04:00
Stats  : +26/-68 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/timeshift/c/a77d35bcc7d10fe57e1901900e1ebf7226c1a1f5?branch=f43

Log:
25.12.4

---
diff --git a/.gitignore b/.gitignore
index cc205b3..121183b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /timeshift-20.03.tar.gz
 /timeshift-21.09.1.tar.gz
 /22.11.2.tar.gz
+/25.12.4.tar.gz

diff --git a/sources b/sources
index 3f683fc..8146fd0 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
-SHA512 (timeshift-20.03.tar.gz) = b49f42cd5ac03753d6c652a05d216dac00d381f1b77bcf5707350af1fae975972b247872e7d8d08fe8140b7cb94b7099eba26ed0ef1e12e165d544bdd6def7b3
-SHA512 (timeshift-21.09.1.tar.gz) = 0e79b41861c1eb041e0592508636f87f77ca240001b238e9e70239898d9a66bcf367380e830682fb8671ade7c1cbdb10ca8c89585f2cb30de35c7480a0fa792b
-SHA512 (22.11.2.tar.gz) = 5b2e5ed350e386924bfcaf1052fc08bf33b8f3ba60166f92b83cdcdfcf40c94ff1d78b35225f5c51ca3138984f7b83bae5ec2e4ef86e8614512c197a3b204483
+SHA512 (25.12.4.tar.gz) = 2cecb99f038e7a9ebf4f1cb797e5d1b05d56bd0afc59a53bab6ccb67204a1f60ff83f8d0c28352f19e6f1514627b32636e250160fc70836161b9e0f8c8527197

diff --git a/timeshift.spec b/timeshift.spec
index 96e8f54..7553f32 100644
--- a/timeshift.spec
+++ b/timeshift.spec
@@ -1,13 +1,5 @@
-# This package needs to be run as root and may
-# run for a long time, thus we build with full
-# hardening. This flags is enabled by default
-# on recent Fedora releases, but we need to
-# specify it for EPEL <= 7 explicitly.
-%global _hardened_build 1
-
-
 Name:           timeshift
-Version:        22.11.2
+Version:        25.12.4
 Release:        %autorelease
 Summary:        System restore tool for Linux
 
@@ -16,7 +8,9 @@ License:        GPL-3.0-or-later OR LGPL-3.0-or-later
 URL:            https://github.com/linuxmint/timeshift
 Source0:        %{url}/archive/refs/tags/%{version}.tar.gz
 
+BuildRequires:  meson
 BuildRequires:  make
+BuildRequires:  help2man
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  libappstream-glib
@@ -27,6 +21,7 @@ BuildRequires:  pkgconfig(gio-unix-2.0)
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(gee-0.8)
 BuildRequires:  pkgconfig(vte-2.91)
+BuildRequires:  pkgconfig(xapp)
 BuildRequires:  vala
 
 Requires:       cronie
@@ -56,77 +51,41 @@ Ubuntu-type subvolume layout (with @ and @home subvolumes).
 
 %prep
 %autosetup -n %{name}-%{version} -p1
-sed -i -e 's@--thread @@g' src/makefile
-sed -i -e 's@--Xcc="-O3" @@g' src/makefile
-sed -i '/${app_name}-uninstall/d' src/makefile
 
 %build
-for flag in %{optflags} %{?__global_ldflags}; do
-  VALAFLAGS="$VALAFLAGS -X $flag"
-done
-
-# Inject Fedora compiler flags and the debug option to valac.
-# Just dump the c-sources.
-sed -i "s|^[\t ]*valac|& --ccode --save-temps -g $VALAFLAGS|" src/makefile
-%make_build
-
-# Move generated c-sources into flat tree so it can be picked
-# up for -debugsource.
-for f in `find src/ -type f -name '*.c'`; do
-  mv -f $f src/
-done
-
-# Inject Fedora compiler flags and the debug option to valac
-# Build the binaries.
-sed -i "s|valac --ccode|valac|" src/makefile
-%make_build
+%meson
+%meson_build
 
 
 %install
-%make_install
-# Remove duplicate
-rm -rf %{buildroot}%{_datadir}/appdata
-
+# Install timeshift.json to /etc/timeshift build sucessfuly
+mkdir -p %{buildroot}/etc/%{name}
+install -m 644 files/%{name}.json %{buildroot}/etc/%{name}/
+%meson_install
 %find_lang %{name}
 
 
 %check
-appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata.xml
+appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.metainfo.xml
 desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}-gtk.desktop
 
 
-%if 0%{?rhel} && 0%{?rhel} <= 7
-%post
-/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-
-%postun
-if [ $1 -eq 0 ] ; then
-    /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
-    /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-fi
-
-%posttrans
-/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-%endif
-
-
 %files -f %{name}.lang
-%license COPYING LICENSE.md
+%license LICENSES/*
 %doc AUTHORS README.md
-%{_bindir}/*
-%{_datadir}/metainfo/*.appdata.xml
-%{_datadir}/applications/*
-%{_datadir}/pixmaps/%{name}.png
+%{_bindir}/timeshift
+%{_bindir}/timeshift-gtk
+%{_bindir}/timeshift-launcher
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
-%{_datadir}/polkit-1/actions/*.policy
-%{_datadir}/%{name}
+%{_datadir}/pixmaps/%{name}.png
+%{_datadir}/polkit-1/actions/in.teejeetech.pkexec.%{name}.policy
+%{_datadir}/%{name}/images/*
+%{_datadir}/applications/%{name}-gtk.desktop
+%{_metainfodir}/com.linuxmint.%{name}.metainfo.xml
 %{_mandir}/man1/%{name}.1*
-%ghost %attr(644, root, root) %{_sysconfdir}/cron.d/%{name}-boot
-%ghost %attr(644, root, root) %{_sysconfdir}/cron.d/%{name}-hourly
-%ghost %attr(664, root, root) %{_sysconfdir}/%{name}.json
-%config %{_sysconfdir}/%{name}/default.json
-
-
+%{_mandir}/man1/%{name}-gtk.1*
+%config(noreplace) %{_sysconfdir}/%{name}/%{name}.json
+%{_sysconfdir}/%{name}/default.json
 
 %changelog
-%autochangelog
\ No newline at end of file
+%autochangelog

                 reply	other threads:[~2026-06-19 17:56 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=178189180306.1.5545636443162982212.rpms-timeshift-a77d35bcc7d1@fedoraproject.org \
    --to=farchord@gmail.com \
    --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