Skip to content

Removed rpm macro which is not needed anymore #180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mchf merged 2 commits into from
Mar 11, 2026
Merged

Removed rpm macro which is not needed anymore #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd75124
Dropped %yast_desktop_files macro. jsc#PED-14507
mchf Mar 10, 2026
c18e917
Updated changelog
mchf Mar 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions build-tools/rpm/macros.yast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,21 +110,6 @@ fi \
%{yast_ydatadir}/devtools/bin/y2metainfo -f ${f} -l "%{license}" -o %{buildroot}/%{yast_metainfodir}/ -u "%{url}" -v "%{version}" \
done

%yast_desktop_files \
\
# on SUSE we use %%suse_update_desktop_file \
# other distris use %%{_bindir}/desktop-file-validate \
%if 0%{?suse_version} \
for f in $(%{_bindir}/find %{buildroot}/%{yast_desktopdir}/ -name '*.desktop') ; do \
d=${f##*/} \
%suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} \
done \
%else # 0%%{?suse_version} \
%{_bindir}/find %{buildroot}/%{yast_desktopdir}/ -name '*.desktop' \\\
-print0 | %{_bindir}/sort -uz | \\\
%{_bindir}/xargs -0 %{_bindir}/desktop-file-validate \
%endif # 0%%{?suse_version}

# install the yast module using autotools/make
%yast_install \
if [ -f "configure.in.in" -o -f "configure.ac.in" ]; then \
Expand All @@ -143,6 +128,3 @@ fi \
echo "Cannot install the package, no configure.{ac|in}.in or Rakefile found" 1>&2 \
exit 1 \
fi \
if [ -d "%{buildroot}/%{yast_desktopdir}" ]; then \
%yast_desktop_files \
fi \
9 changes: 8 additions & 1 deletion package/yast2-devtools.changes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Mar 10 17:11:41 UTC 2026 - Michal Filka <mfilka@suse.com>

- jsc#PED-14507
- dropped %yast_desktop_files macro
- 5.0.3

-------------------------------------------------------------------
Fri Jun 6 14:47:29 UTC 2025 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>

Expand Down Expand Up @@ -33,7 +40,7 @@ Fri Mar 03 14:44:07 UTC 2023 - Ladislav Slezák <lslezak@suse.cz>
-------------------------------------------------------------------
Fri Sep 9 08:21:11 UTC 2022 - Michal Filka <mfilka@suse.com>

- bsc#1203227
- bsc#1203227
- Replaced egrep with grep -E.
- 4.5.5

Expand Down
2 changes: 1 addition & 1 deletion package/yast2-devtools.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@


Name: yast2-devtools
Version: 5.0.2
Version: 5.0.3
Release: 0
Summary: YaST2 - Development Tools
License: GPL-2.0-or-later
Expand Down
Loading