Skip to content

Commit

Permalink
#3592 simplify
Browse files Browse the repository at this point in the history
  • Loading branch information
totaam committed Oct 9, 2022
1 parent 4650893 commit af4f1ff
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions packaging/rpm/xpra.spec
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ Conflicts: xpra-codecs-freeworld
This package contains extra picture and video codecs used by xpra clients and servers.


%package -n xpra-audio
%package audio
Summary: python3 build of xpra audio support
Group: Networking
#Provides: python3-xpra-audio
Expand All @@ -204,11 +204,11 @@ BuildRequires: gstreamer1-plugins-good
BuildRequires: pulseaudio
BuildRequires: pulseaudio-utils
%endif
%description -n xpra-audio
%description audio
This package contains audio support for xpra.


%package -n xpra-client
%package client
Summary: xpra client
Group: Networking
#Provides: python3-xpra-client
Expand Down Expand Up @@ -241,11 +241,11 @@ BuildRequires: xclip
BuildRequires: zlib-devel
%endif
%endif
%description -n xpra-client
%description client
This package contains the xpra client.


%package -n xpra-server
%package server
Summary: xpra server
Group: Networking
#Provides: python3-xpra-server
Expand Down Expand Up @@ -321,7 +321,7 @@ BuildRequires: xorg-x11-drv-dummy
%endif
Requires(post): /usr/sbin/semodule, /usr/sbin/semanage, /sbin/restorecon, /sbin/fixfiles
Requires(postun): /usr/sbin/semodule, /usr/sbin/semanage, /sbin/restorecon, /sbin/fixfiles
%description -n xpra-server
%description server
This package contains the xpra server.


Expand Down Expand Up @@ -550,7 +550,7 @@ popd
%endif


%post -n xpra-server
%post server
%if 0%{?fedora}%{?el8}
%tmpfiles_create xpra.conf
#fedora can use sysusers.d instead
Expand Down Expand Up @@ -611,12 +611,12 @@ fi
#reload dbus to get our new policy:
systemctl reload dbus

%post -n xpra-client
%post client
/usr/bin/update-mime-database &> /dev/null || :
/usr/bin/update-desktop-database &> /dev/null || :
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :

%preun -n xpra-server
%preun server
if [ $1 -eq 0 ] ; then
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
/bin/systemctl disable xpra.service > /dev/null 2>&1 || :
Expand All @@ -625,7 +625,7 @@ if [ $1 -eq 0 ] ; then
/bin/systemctl stop xpra.socket > /dev/null 2>&1 || :
fi

%postun -n xpra-server
%postun server
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
%if 0%{update_firewall}
if [ $1 -eq 0 ]; then
Expand Down Expand Up @@ -655,7 +655,7 @@ if [ $1 -eq 0 ] ; then
fi
%endif

%postun -n xpra-client
%postun client
/usr/bin/update-mime-database &> /dev/null || :
/usr/bin/update-desktop-database &> /dev/null || :
if [ $1 -eq 0 ] ; then
Expand Down

0 comments on commit af4f1ff

Please sign in to comment.