From 828c0ad8387732adcbcc66907bf38e560185675d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret=20=28fepitre=29?= Date: Thu, 28 May 2020 10:30:42 +0200 Subject: [PATCH 1/3] Add installing instructions for RPM distros --- README.md | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/README.md b/README.md index 2f9b931..8c0410c 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,38 @@ Patches and pull requests are welcome! Feel free to contact me at: dns.botond at gmail dot com. +Installing +---------- + +### Fedora/CentOS/openSUSE + +The package is available as RPM for Fedora 30+, openSUSE 15.1+ and CentOS 7. It's provided on a COPR +repository maintained by [@fepitre](https://github.com/fepitre): https://copr.fedorainfracloud.org/coprs/fepitre/xfce4-i3/. + +#### Fedora and CentOS + +Please have a look on the [official documentation](https://docs.pagure.org/copr.copr/how_to_enable_repo.html#how-to-enable-repo) on how to enable COPR repository. Then, for Fedora, + +* dnf install xfce4-i3-workspaces-plugin + +and for CentOS, + +* yum install xfce4-i3-workspaces-plugin + +#### openSUSE + +Add the repo file by adjusting openSUSE release version. For example, for 15.1 + +* zypper addrepo -f https://copr.fedorainfracloud.org/coprs/fepitre/xfce4-i3/repo/opensuse-leap-15.1/fepitre-xfce4-i3-opensuse-leap-15.1.repo fepitre-xfce4-i3 + +and for Tumbleweed + +* zypper addrepo -f https://copr.fedorainfracloud.org/coprs/fepitre/xfce4-i3/repo/opensuse-tumbleweed/fepitre-xfce4-i3-opensuse-tumbleweed.repo fepitre-xfce4-i3 + +Then, install the package + +* zypper install xfce4-i3-workspaces-plugin + Building -------- From dcdfcee9ec0c6bd16ec0b2617554d28aacd17c2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret=20=28fepitre=29?= Date: Thu, 28 May 2020 10:33:43 +0200 Subject: [PATCH 2/3] Few polishing for code blocks --- README.md | 47 +++++++++++++++++++++++++++++++---------------- 1 file changed, 31 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 8c0410c..c01780e 100644 --- a/README.md +++ b/README.md @@ -35,25 +35,35 @@ repository maintained by [@fepitre](https://github.com/fepitre): https://copr.fe Please have a look on the [official documentation](https://docs.pagure.org/copr.copr/how_to_enable_repo.html#how-to-enable-repo) on how to enable COPR repository. Then, for Fedora, -* dnf install xfce4-i3-workspaces-plugin +``` +dnf install xfce4-i3-workspaces-plugin +``` and for CentOS, -* yum install xfce4-i3-workspaces-plugin +``` +yum install xfce4-i3-workspaces-plugin +``` #### openSUSE Add the repo file by adjusting openSUSE release version. For example, for 15.1 -* zypper addrepo -f https://copr.fedorainfracloud.org/coprs/fepitre/xfce4-i3/repo/opensuse-leap-15.1/fepitre-xfce4-i3-opensuse-leap-15.1.repo fepitre-xfce4-i3 +``` +zypper addrepo -f https://copr.fedorainfracloud.org/coprs/fepitre/xfce4-i3/repo/opensuse-leap-15.1/fepitre-xfce4-i3-opensuse-leap-15.1.repo fepitre-xfce4-i3 +``` and for Tumbleweed -* zypper addrepo -f https://copr.fedorainfracloud.org/coprs/fepitre/xfce4-i3/repo/opensuse-tumbleweed/fepitre-xfce4-i3-opensuse-tumbleweed.repo fepitre-xfce4-i3 +``` +zypper addrepo -f https://copr.fedorainfracloud.org/coprs/fepitre/xfce4-i3/repo/opensuse-tumbleweed/fepitre-xfce4-i3-opensuse-tumbleweed.repo fepitre-xfce4-i3 +``` Then, install the package -* zypper install xfce4-i3-workspaces-plugin +``` +zypper install xfce4-i3-workspaces-plugin +``` Building -------- @@ -76,24 +86,29 @@ Building + On binary distros you may have to install the -dev version of the required packages + For the compilation to work out of the box I had to install i3ipc-glib in -the /usr prefix too. +the `/usr` prefix too. ### Building from git (needs autotools) -* git clone https://github.com/denesb/xfce4-i3-workspaces-plugin.git -* cd xfce4-i3-workspaces-plugin -* ./autogen.sh --prefix=/usr -* make -* sudo make install +``` +git clone https://github.com/denesb/xfce4-i3-workspaces-plugin.git +cd xfce4-i3-workspaces-plugin +./autogen.sh --prefix=/usr +make +sudo make install +``` ### Building from release tarball * Download & extract tarball -* cd xfce4-i3-workspaces-plugin -* ./configure --prefix=/usr -* make -* sudo make install + +``` +cd xfce4-i3-workspaces-plugin +./configure --prefix=/usr +make +sudo make install +``` *Note:* -The --prefix=/usr is needed because if installed in /usr/local prefix the +The `--prefix=/usr` is needed because if installed in `/usr/local` prefix the plugin is not discovered by xfce-panel. Maybe there is a way to tell xfce-panel to look in other places too, but I haven't found it just yet. From 96ddc5d3e1e96bc117ffb087e4017ce99d6027f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret=20=28fepitre=29?= Date: Thu, 28 May 2020 12:22:30 +0200 Subject: [PATCH 3/3] spec: fix opensuse name for glib2 --- xfce4-i3-workspaces-plugin.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xfce4-i3-workspaces-plugin.spec b/xfce4-i3-workspaces-plugin.spec index 4c12678..abce931 100644 --- a/xfce4-i3-workspaces-plugin.spec +++ b/xfce4-i3-workspaces-plugin.spec @@ -14,7 +14,11 @@ BuildRequires: libxfce4util-devel BuildRequires: xfce4-panel-devel BuildRequires: i3ipc-glib +%if 0%{?suse_version} >= 1500 +Requires: libglib-2_0-0 +%else Requires: glib2 +%endif Requires: libxfce4ui Requires: libxfce4util Requires: xfce4-panel