diff --git a/anda/desktops/elementary/switchboard-plug-wallet/anda.hcl b/anda/desktops/elementary/switchboard-plug-wallet/anda.hcl deleted file mode 100644 index d57cb1789a..0000000000 --- a/anda/desktops/elementary/switchboard-plug-wallet/anda.hcl +++ /dev/null @@ -1,5 +0,0 @@ -project pkg { - rpm { - spec = "switchboard-plug-wallet.spec" - } -} diff --git a/anda/desktops/elementary/switchboard-plug-wallet/switchboard-plug-wallet.spec b/anda/desktops/elementary/switchboard-plug-wallet/switchboard-plug-wallet.spec deleted file mode 100644 index 33e9ce8e5b..0000000000 --- a/anda/desktops/elementary/switchboard-plug-wallet/switchboard-plug-wallet.spec +++ /dev/null @@ -1,63 +0,0 @@ -%global __provides_exclude_from ^%{_libdir}/switchboard/.*\\.so$ - -%global srcname switchboard-plug-wallet - -%global plug_type personal -%global plug_name wallet -%global plug_rdnn io.elementary.switchboard.wallet - -%global commit 50582fc7ee43a4b47647d04786dcf1d0eb45af36 -%global commit_date 20240218 - -Name: switchboard-plug-wallet -Summary: Switchboard Wallet Plug -Version: %commit_date.%(c=%commit; echo ${c:0:7}) -Release: 2%?dist -License: GPL-3.0-or-later - -URL: https://github.com/elementary/%name -Source0: %url/archive/%version/%srcname-%version.tar.gz - -BuildRequires: libappstream-glib -BuildRequires: meson -BuildRequires: vala -BuildRequires: fdupes - -BuildRequires: pkgconfig(granite) >= 0.5 -BuildRequires: gtk3-devel -BuildRequires: pkgconfig(libsecret-1) -BuildRequires: switchboard-devel - -Requires: switchboard%{?_isa} -Supplements: switchboard%{?_isa} - -%description -Manage Payment Methods and related settings. - - -%prep -%autosetup -n %srcname-%commit -p1 - - -%build -%meson -%meson_build - - -%install -%meson_install -%fdupes %buildroot%_datadir/icons/hicolor - - -%files -%doc README.md -%license COPYING - -%_libdir/switchboard/%plug_type/lib%plug_rdnn.so -%_datadir/icons/hicolor/*/apps/%plug_rdnn.svg -%_datadir/locale/*/LC_MESSAGES/%plug_rdnn.mo - - -%changelog -* Tue Jun 13 2023 windowsboy111 - bfe73dfb95d9b46a0a34e0db35a178233c8552b0-1 -- Initial package. diff --git a/anda/desktops/elementary/switchboard-plug-wallet/update.rhai b/anda/desktops/elementary/switchboard-plug-wallet/update.rhai deleted file mode 100644 index c4c276a437..0000000000 --- a/anda/desktops/elementary/switchboard-plug-wallet/update.rhai +++ /dev/null @@ -1,4 +0,0 @@ -rpm.global("commit", gh_commit("elementary/switchboard-plug-wallet")); -if rpm.changed() { - rpm.global("commit_date", date()); -} diff --git a/anda/terra/obsolete/anda.hcl b/anda/terra/obsolete/anda.hcl new file mode 100644 index 0000000000..b8007c60e4 --- /dev/null +++ b/anda/terra/obsolete/anda.hcl @@ -0,0 +1,6 @@ +project pkg { + arches = ["x86_64"] + rpm { + spec = "terra-obsolete.spec" + } +} diff --git a/anda/terra/obsolete/terra-obsolete.spec b/anda/terra/obsolete/terra-obsolete.spec new file mode 100644 index 0000000000..3e2c64159d --- /dev/null +++ b/anda/terra/obsolete/terra-obsolete.spec @@ -0,0 +1,126 @@ +Name: terra-obsolete +# Please keep the version equal to the targeted Terra release +Version: 39 +# The dist number is the version here, it is intentionally not repeated in the release +%global dist %nil + +Release: %autorelease +Summary: A package to obsolete retired packages, based on Fedora's equivalent package + +License: LicenseRef-Fedora-Public-Domain +BuildArch: noarch + +# =============================================================================== +# Skip down below these convenience macros +%define obsolete_ticket() %{lua: + local ticket = rpm.expand('%1') + + -- May need to declare the master structure + if type(obs) == 'nil' then + obs = {} + end + + if ticket == '%1' then + rpm.expand('%{error:No ticket provided to obsolete_ticket}') + end + + if ticket == 'Ishouldfileaticket' then + ticket = nil + end + + -- Declare a new set of obsoletes + local index = #obs+1 + obs[index] = {} + obs[index].ticket = ticket + obs[index].list = {} +} + +%define obsolete() %{lua: + local pkg = rpm.expand('%1') + local ver = rpm.expand('%2') + local pkg_ + local ver_ + local i + local j + + if pkg == '%1' then + rpm.expand('%{error:No package name provided to obsolete}') + end + if ver == '%2' then + rpm.expand('%{error:No version provided to obsolete}') + end + + if not string.find(ver, '-') then + rpm.expand('%{error:You must provide a version-release, not just a version.}') + end + + print('Obsoletes: ' .. pkg .. ' < ' .. ver) + + -- Check if the package wasn't already obsoleted + for i = 1,#obs do + for j = 1,#obs[i].list do + pkg_, ver_ = table.unpack(obs[i].list[j]) + if pkg == pkg_ then + rpm.expand('%{error:' .. pkg ..' obsoleted multiple times (' .. ver_ .. ' and ' .. ver ..').}') + end + end + end + + -- Append this obsolete to the last set of obsoletes in the list + local list = obs[#obs].list + list[#list+1] = {pkg, ver} +} + +%define list_obsoletes %{lua: + local i + local j + for i = 1,#obs do + for j = 1,#obs[i].list do + pkg, ver = table.unpack(obs[i].list[j]) + print(' ' .. pkg .. ' < ' .. ver .. '\\n') + end + if obs[i].ticket == nil then + print(' (No ticket was provided!)\\n\\n') + else + print(' (See ' .. obs[i].ticket .. ')\\n\\n') + end + end +} + +# =============================================================================== +# Add calls to the obsolete_ticket and obsolete macros below, along with a note +# indicating the Terra version in which the entries can be removed. This is +# generally three releases beyond whatever release Rawhide is currently. The +# macros make this easy, and will automatically update the package description. + +# A link with information is important. Please don't add things here +# without having a link to a PR on GitHub, a link to a package +# retirement commit, or something similar. We generally recommend you +# put the GitHub PR in which the obsolete is being added. + +# All Obsoletes: entries MUST be versioned (including the release), +# with the version being higher (!) +# than the last version-release of the obsoleted package. +# This allows the package to return to the distribution later. +# The best possible thing to do is to find the last version-release +# which was in the distribution, add one to the release, +# and add that version without using a dist tag. +# This allows a rebuild with a bumped Release: to be installed. + +# Remove in 43 +%obsolete_ticket https://github.com/terrapkg/packages/pull/994 +%obsolete switchboard-plug-wallet 50582fc-3 + +%description + +Currently obsoleted packages: + +%list_obsoletes + +%prep + +%files + +%changelog +%autochangelog + diff --git a/comps.xml b/comps.xml index e21e609648..70c1d8382c 100644 --- a/comps.xml +++ b/comps.xml @@ -66,7 +66,6 @@ switchboard-plug-security-privacy switchboard-plug-datetime switchboard-plug-parental-controls - switchboard-plug-wallet switchboard-plug-useraccounts switchboard-plug-wacom switchboard-plug-locale