openEuler-logos.spec

@@ -1,9 +1,9 @@
 %global codename verne
 
-Name:           %{_vendor}-logos
+Name:           openEuler-logos
 Version:        1.0
-Release:        9
-Summary:        %{_vendor}-related icons and pictures
+Release:        6
+Summary:        openEuler-related icons and pictures
 License:        Licensed only for approved usage, see COPYING for details. 
 Source0:        openEuler-logos-%{version}.tar.xz
 BuildArch:      noarch
@@ -11,25 +11,16 @@ BuildRequires:  hardlink
 Requires(post): coreutils
 
 Provides:       gnome-logos = %{version}-%{release} system-logos = %{version}-%{release}
-Provides:       %{_vendor}-logos = %{version}-%{release}
+Provides:       openEuler-logos = %{version}-%{release}
 # We carry the GSettings schema override, tell that to gnome-desktop3
 Provides:       system-backgrounds-gnome
 
 %description
-The %{_vendor}-logos package (the "Package") contains files created by the
-%{_vendor} Project.
-
-%package httpd
-Summary:	%{_vendor}-related icons and pictures used by httpd
-Provides:	system-logos-httpd = %{version}-%{release}
-BuildArch:	noarch
-
-%description httpd
-The %{_vendor}-logos-httpd package contains image files which incorporate the
-%{_vendor} trademarks (the "Marks").
+The openEuler-logos package (the "Package") contains files created by the
+openEuler Project.
 
 %prep
-%setup -q -n openEuler-logos-%{version}
+%setup -q
 
 %build
 
@@ -69,7 +60,7 @@ install -p -m 644 icons/hicolor/scalable/apps/xfce4_xicon1.svg $RPM_BUILD_ROOT%{
 (cd anaconda; make DESTDIR=$RPM_BUILD_ROOT install)
 
 # save some dup'd icons
-hardlink -v %{buildroot}/
+/usr/sbin/hardlink -v %{buildroot}/
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
@@ -88,7 +79,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 %files
 %license COPYING
-%exclude %{_datadir}/pixmaps/poweredby.png
 %{_datadir}/backgrounds/*
 %{_datadir}/glib-2.0/schemas/*.override
 %{_datadir}/gnome-background-properties/*.xml
@@ -99,20 +89,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_datadir}/anaconda/pixmaps/*
 %{_datadir}/icons/hicolor/*/apps/*
 
-%files httpd
-%license COPYING
-%{_datadir}/pixmaps/poweredby.png
-
 %changelog
-* Tue May 21 2024 xiaochn <xiaochuannan@inspur.com> - 1.0-9
-- Supports custom vendor
-
-* Mon Nov 28 2022 zhangqiumiao <zhangqiumiao1@huawei.com> - 1.0-8
-- subpackage poweredby.png to minimize httpd footprint
-
-* Mon Jul 27 2020 lingsheng <lingsheng@huawei.com> - 1.0-7
-- Not use hardlink absolute path
-
 * Mon Dec 30 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.0-6
 - Type:bugfix
 - ID:NA

openEuler-logos.yaml

@@ -1,5 +0,0 @@
-git_url: https://gitee.com/src-openEuler/openEuler-logos
-version_control: gitee
-src_repo: src-openEuler/openEuler-logos
-tag_prefix: "^v"
-seperator: "."