Fix conflict

Merge branch 'rawhide' into f36
Update to 22.09
2023-01-31 12:49:29 +10:30 · 2022-12-03 10:19:39 +10:30 · 2022-09-29 18:54:31 +09:30 · 2022-08-29 21:29:49 +09:30
3 changed files with 29 additions and 63 deletions
--- a/.gitignore
+++ b/.gitignore
@ -5,4 +5,3 @@
 /vakzination-22.09.tar.xz
 /vakzination-22.11.tar.xz
 /vakzination-23.01.0.tar.xz
-/vakzination-851a9fb0178003bb931d637356ee82c4ecfc4bc4.tar.gz
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (vakzination-851a9fb0178003bb931d637356ee82c4ecfc4bc4.tar.gz) = 989ca08254dc015f56da2f0d8a1180cfeac28f2dfe7e8d54788564bda91491a33898999c16cb9e4941af83ba9ca5a99d7e59e85b7a5a9ec10eb05ee846777737
+SHA512 (vakzination-23.01.0.tar.xz) = f661f8086dccd949d3eb00f47585ef674f4663923086b7a62efc342a45f24dee064b9eaa8ad92e174302ba45e01e74b187916a8ac51a773a5275342450b3ae73
--- a/vakzination.spec
+++ b/vakzination.spec
@ -1,96 +1,60 @@
-%global commit0 851a9fb0178003bb931d637356ee82c4ecfc4bc4
-%global date 20241228
-%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
-
 Name:           vakzination
-Version:        23.01.0^git%{date}.%{shortcommit0}
-Release:        5%{?dist}
-
-License:        CC-PDDC AND Apache-2.0 AND LGPL-2.0-or-later AND CC0-1.0 AND BSD-3-Clause AND GPL-2.0-or-later AND FSFAP
+Version:        23.01.0
+Release:        1%{?dist}
+License:        Apache2.0 and BSD and CC-PDDC and CC0-1.0 and FSFAP and GPLv2+
 Summary:        Vakzination manages your health certificates like vaccination, test, and recovery certificates.
 Url:            https://invent.kde.org/plasma-mobile/vakzination
-Source:         https://invent.kde.org/pim/%{name}/-/archive/%{commit0}/%{name}-%{commit0}.tar.gz
+Source:         https://download.kde.org/stable/plasma-mobile/%{version}/vakzination-%{version}.tar.xz

 ExclusiveArch:  %{java_arches}

 BuildRequires: desktop-file-utils
 BuildRequires: extra-cmake-modules
 BuildRequires: gcc-c++
-BuildRequires: kf6-rpm-macros
+BuildRequires: kf5-rpm-macros

-BuildRequires: cmake(KF6Config)
-BuildRequires: cmake(KF6CoreAddons)
-BuildRequires: cmake(KF6I18n)
-BuildRequires: cmake(KF6Kirigami2)
-BuildRequires: cmake(KF6Prison)
+BuildRequires: cmake(KF5CalendarCore)
+BuildRequires: cmake(KF5Config)
+BuildRequires: cmake(KF5Contacts)
+BuildRequires: cmake(KF5I18n)
+BuildRequires: cmake(KF5Kirigami2)
+BuildRequires: cmake(KF5Mime)
+BuildRequires: cmake(KF5Prison)
 BuildRequires: cmake(KHealthCertificate)
-BuildRequires: cmake(KPim6Itinerary)
+BuildRequires: cmake(KPimItinerary)
+BuildRequires: cmake(KPimPkPass)

-BuildRequires: cmake(Qt6Core)
-BuildRequires: cmake(Qt6Gui)
-BuildRequires: cmake(Qt6Qml)
-BuildRequires: cmake(Qt6QuickControls2)
-BuildRequires: cmake(Qt6Svg)
+BuildRequires: cmake(Qt5Core)
+BuildRequires: cmake(Qt5Qml)
+BuildRequires: cmake(Qt5QuickControls2)
+BuildRequires: cmake(Qt5Svg)

 %description
 %{summary}.

 %prep
-%autosetup -p1 -n %{name}-%{commit0}
+%autosetup

 %build
-%cmake_kf6
+%cmake_kf5
 %cmake_build

 %install
 %cmake_install
 %find_lang %{name}
-desktop-file-install --dir=%{buildroot}%{_kf6_datadir}/applications/ %{buildroot}/%{_kf6_datadir}/applications/org.kde.%{name}.desktop
+desktop-file-install --dir=%{buildroot}%{_kf5_datadir}/applications/ %{buildroot}/%{_kf5_datadir}/applications/org.kde.%{name}.desktop

 %files -f %{name}.lang

 %license LICENSES/*

-%{_kf6_bindir}/%{name}
+%{_kf5_bindir}/%{name}

-%{_kf6_datadir}/applications/org.kde.%{name}.desktop
+%{_kf5_datadir}/applications/org.kde.%{name}.desktop

-%{_kf6_metainfodir}/org.kde.%{name}.metainfo.xml
+%{_kf5_metainfodir}/org.kde.%{name}.metainfo.xml

 %changelog
-* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 23.01.0^git20241228.851a9fb-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
-
-* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 23.01.0^git20241228.851a9fb-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 23.01.0^git20241228.851a9fb-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 23.01.0^git20241228.851a9fb-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Sat Jan 11 2025 Alessandro Astone <ales.astone@gmail.com> - 23.01.0^git20241228.851a9fb-1
- Use git snapshot for porting to Qt6
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 23.01.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 23.01.0-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Mon Aug 14 2023 Justin Zobel <justin.zobel@gmail.com> - 23.01.0-6
- Rebuild
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 23.01.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Thu Jun 08 2023 Justin Zobel <justin.zobel@gmail.com> - 23.01.0-3
- rebuilt
-
-* Thu May 04 2023 Justin Zobel <justin@1707.io> - 23.01.0-2
- Rebuild
-
 * Mon Jan 30 2023 Justin Zobel <justin@1707.io> - 23.01.0-1
 - Update to 23.01.0

@ -103,6 +67,9 @@ desktop-file-install --dir=%{buildroot}%{_kf6_datadir}/applications/ %{buildroot
 * Wed Sep 28 2022 Justin Zobel <justin@1707.io> - 22.09-1
 - Update to 22.09

+* Mon Aug 29 2022 Justin Zobel <justin@1707.io> - 22.06-2
+- Rebuild against khealthcertificate 22.06
+
 * Fri Aug 26 2022 Justin Zobel <justin@1707.io> - 22.06-1
 - Update to 22.06
Author	SHA1	Message	Date
Justin Zobel	805d34a309	Fix conflict	2023-01-31 12:49:29 +10:30
Justin Zobel	aaea210f36	Merge branch 'rawhide' into f36	2022-12-03 10:19:39 +10:30
Justin Zobel	c3bcbf0e42	Update to 22.09	2022-09-29 18:54:31 +09:30
Justin Zobel	2fca0b41d0	Rebuild for khealthcertificate	2022-08-29 21:29:49 +09:30