nsITobin 3 weeks ago
parent
commit
cac8cfcb01
2 changed files with 96 additions and 3 deletions
  1. 2 2
      picom/c2:-replace-pcre-with-pcre2.patch
  2. 94 1
      picom/package.spec

+ 2 - 2
picom/c2:-replace-pcre-with-pcre2.patch

@@ -19,7 +19,7 @@ Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
  2 files changed, 79 insertions(+), 81 deletions(-)
 
 diff --git a/src/c2.c b/src/c2.c
-index 80ecb24cd1..f8af6992ed 100644
+index 80ecb24c..f8af6992 100644
 --- a/src/c2.c
 +++ b/src/c2.c
 @@ -17,15 +17,8 @@
@@ -267,7 +267,7 @@ index 80ecb24cd1..f8af6992ed 100644
  					assert(0);
  #endif
 diff --git a/src/meson.build b/src/meson.build
-index 60d83a891f..09eb07b6c0 100644
+index 60d83a89..09eb07b6 100644
 --- a/src/meson.build
 +++ b/src/meson.build
 @@ -44,11 +44,8 @@ if get_option('config_file')

+ 94 - 1
picom/package.spec

@@ -1,5 +1,16 @@
+## START: Set by rpmautospec
+## (rpmautospec version 0.3.5)
+## RPMAUTOSPEC: autorelease, autochangelog
+%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
+    release_number = 3;
+    base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
+    print(release_number + base_release_number - 1);
+}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
+## END: Set by rpmautospec
+
 # Note: compton fork renamed to 'picom' since version 7.5
 
+%global oldname compton-ng
 %global tarball_version %%(echo %{version} | tr '~' '-')
 
 Name:           picom
@@ -46,7 +57,12 @@ BuildRequires:  pkgconfig(xext)
 BuildRequires:  pkgconfig(xproto)
 
 Requires:       hicolor-icon-theme
-Conflicts:      compton
+
+Conflicts:      compton%{?_isa}
+
+Provides:       %{oldname}%{?_isa} = %{version}-%{release}
+
+Obsoletes:      %{oldname} =< 7.5-1
 
 %description
 picom is a compositor for X, and a fork of Compton.
@@ -87,3 +103,80 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_mandir}/man1/*.1*
 %{_sysconfdir}/xdg/autostart/%{name}.desktop
 
+
+%changelog
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 10.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 10.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sat Dec 17 2022 Artem Polishchuk <ego.cordatus@gmail.com> - 10.2-1
+- chore: Update to 10.2
+
+* Thu Nov 24 2022 Artem Polishchuk <ego.cordatus@gmail.com> - 10.1-2
+- build: Add upstream pcre2 patch
+
+* Wed Nov 23 2022 Artem Polishchuk <ego.cordatus@gmail.com> - 10.1-1
+- build: Update to 10.1
+
+* Mon Nov 14 2022 Artem Polishchuk <ego.cordatus@gmail.com> - 10-1
+- build: Update to 10
+
+* Sun Oct 30 2022 Artem Polishchuk <ego.cordatus@gmail.com> - 10~rc1-1
+- build: Update to 10-rc1 for Rawhide
+
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 9.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Mon Feb 14 2022 Artem Polishchuk <ego.cordatus@gmail.com> - 9.1-1
+- chore(update): 9.1
+
+* Sun Jan 30 2022 Artem Polishchuk <ego.cordatus@gmail.com> - 8.2-6
+- fix: FTBFS 36 and building with docs
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 8.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Dec 24 2021 Björn Esser <besser82@fedoraproject.org> - 8.2-4
+- Rebuild(uthash)
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 8.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 8.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Sat Oct 24 2020 Artem Polishchuk <ego.cordatus@gmail.com> - 8.2-1
+- build(update): 8.2
+
+* Tue Sep  8 2020 Artem Polishchuk <ego.cordatus@gmail.com> - 8.1-1
+- Update to 8.1
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Apr 21 2020 Artem Polishchuk <ego.cordatus@gmail.com> - 8-1
+- Update to 8
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Fri Dec 06 2019 Artem Polishchuk <ego.cordatus@gmail.com> - 7.5-2
+- Renamed to 'picom'
+
+* Mon Nov 25 2019 Artem Polishchuk <ego.cordatus@gmail.com> - 7.5-1
+- Update to 7.5
+
+* Sat Sep 21 2019 Artem Polishchuk <ego.cordatus@gmail.com> - 7.4-1
+- Update to 7.4
+- Drop git submodule, now vendored with release tarball
+
+* Tue Aug 13 2019 Artem Polishchuk <ego.cordatus@gmail.com> - 7.2-2
+- Update to 7.2
+- Packaging fixes
+- Disable LTO
+
+* Tue Aug 06 2019 Artem Polishchuk <ego.cordatus@gmail.com> - 7.1-5
+- Initial package
+