!22 Exclude confics file which already in gcr4

From: @dwl301 
Reviewed-by: @small_leek 
Signed-off-by: @small_leek
This commit is contained in:
openeuler-ci-bot 2023-03-03 09:41:09 +00:00 committed by Gitee
commit 3c7dcab622
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F

View File

@ -4,7 +4,7 @@
Name: gcr Name: gcr
Version: 3.41.1 Version: 3.41.1
Release: 2 Release: 3
Summary: A library for bits of crypto UI and parsing Summary: A library for bits of crypto UI and parsing
License: LGPLv2+ License: LGPLv2+
URL: https://wiki.gnome.org/Projects/CryptoGlue URL: https://wiki.gnome.org/Projects/CryptoGlue
@ -22,7 +22,7 @@ BuildRequires: /usr/bin/gpg2
BuildRequires: openssh-clients BuildRequires: openssh-clients
BuildRequires: openssh-clients BuildRequires: openssh-clients
BuildRequires: libxslt BuildRequires: libxslt
Requires: %{name}-base%{?_isa} = %{version}-%{release} Requires: %{name}-base%{?_isa} = %{version}-%{release}
Requires: openssh-clients Requires: openssh-clients
Requires: openssh-clients Requires: openssh-clients
@ -41,7 +41,7 @@ The gcr-devel package includes the header files for the gcr library.
%package base %package base
Summary: Library files for gcr Summary: Library files for gcr
Conflicts: %{name} < 3.28.1-3 Conflicts: %{name} < 3.28.1-3
%description base %description base
The gcr-base package includes the gcr-base library. The gcr-base package includes the gcr-base library.
@ -49,7 +49,7 @@ The gcr-base package includes the gcr-base library.
%autosetup -n %{name}-%{version} -p1 %autosetup -n %{name}-%{version} -p1
# Use system valgrind headers instead # Use system valgrind headers instead
%if 0%{?has_valgrind} %if 0%{?has_valgrind}
rm -rf build/valgrind/ rm -rf build/valgrind/
%endif %endif
%build %build
@ -64,13 +64,10 @@ rm -rf build/valgrind/
desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/gcr-viewer.desktop desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/gcr-viewer.desktop
%post %post
%systemd_user_post gcr-ssh-agent.service
%preun %preun
%systemd_user_preun gcr-ssh-agent.service
%postun %postun
%systemd_user_postun_with_restart gcr-ssh-agent.service
%files -f %{name}.lang %files -f %{name}.lang
%defattr(-,root,root) %defattr(-,root,root)
@ -88,14 +85,14 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/gcr-viewer.desktop
%{_datadir}/icons/hicolor/*/apps/* %{_datadir}/icons/hicolor/*/apps/*
%{_datadir}/mime/packages/gcr-crypto-types.xml %{_datadir}/mime/packages/gcr-crypto-types.xml
%{_libexecdir}/gcr-prompter %{_libexecdir}/gcr-prompter
%{_libexecdir}/gcr-ssh-agent %exclude %{_libexecdir}/gcr-ssh-agent
%{_libexecdir}/gcr-ssh-askpass %{_libexecdir}/gcr-ssh-askpass
%{_datadir}/dbus-1/services/org.gnome.keyring.PrivatePrompter.service %{_datadir}/dbus-1/services/org.gnome.keyring.PrivatePrompter.service
%{_datadir}/dbus-1/services/org.gnome.keyring.SystemPrompter.service %{_datadir}/dbus-1/services/org.gnome.keyring.SystemPrompter.service
%{_datadir}/applications/gcr-prompter.desktop %{_datadir}/applications/gcr-prompter.desktop
%{_userunitdir}/gcr-ssh-agent.service %exclude %{_userunitdir}/gcr-ssh-agent.service
%{_userunitdir}/gcr-ssh-agent.socket %exclude %{_userunitdir}/gcr-ssh-agent.socket
%files devel %files devel
%{_includedir}/gck-1 %{_includedir}/gck-1
%{_includedir}/gcr-3 %{_includedir}/gcr-3
@ -109,12 +106,15 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/gcr-viewer.desktop
%{_datadir}/gir-1.0 %{_datadir}/gir-1.0
%{_datadir}/doc %{_datadir}/doc
%{_datadir}/vala/ %{_datadir}/vala/
%files base %files base
%{_libdir}/libgck-1.so.0* %{_libdir}/libgck-1.so.0*
%{_libdir}/libgcr-base-3.so.1* %{_libdir}/libgcr-base-3.so.1*
%changelog %changelog
* Thu Mar 02 2023 wenlong ding <wenlong.ding@turbolinux.com.cn> - 3.41.1-3
- Exclude confics file which already in gcr4
* Mon Feb 13 2023 zhangpan <zhangpan103@h-partners.com> - 3.41.1-2 * Mon Feb 13 2023 zhangpan <zhangpan103@h-partners.com> - 3.41.1-2
- remove sensitive info - remove sensitive info