Add man page, appdata

This commit is contained in:
Mamoru TASAKA 2014-12-21 02:51:59 +09:00
commit a66d456012
4 changed files with 275 additions and 1 deletions

View file

@ -0,0 +1,65 @@
From 12dcd5315f7c5b8c9487b81ad73a577959633ceb Mon Sep 17 00:00:00 2001
From: dghart <dghart@users.sourceforge.net>
Date: Fri, 12 Dec 2014 16:43:28 +0000
Subject: [PATCH 2/4] Add the man page to git
See https://sourceforge.net/p/fourpane/feature-requests/9/
---
4Pane.1 | 45 +++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 45 insertions(+)
create mode 100755 4Pane.1
diff --git a/4Pane.1 b/4Pane.1
new file mode 100755
index 0000000..f7a7644
--- /dev/null
+++ b/4Pane.1
@@ -0,0 +1,45 @@
+.\" Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH 4PANE 1 "October 27, 2007"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh disable hyphenation
+.\" .hy enable hyphenation
+.\" .ad l left justify
+.\" .ad b justify to both left and right margins
+.\" .nf disable filling
+.\" .fi enable filling
+.\" .br insert line break
+.\" .sp <n> insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+4Pane - a detailed-view quad-pane file manager for GTK+
+.SH SYNOPSIS
+.B 4Pane
+[-d <str>] [-c <str>] [-h] [Display from this filepath (optional)...]
+.br
+
+.SH DESCRIPTION
+This manual page documents only 4Pane\'s rarely-used invocation options (generally you'll just type '4Pane').
+.br
+A detailed manual is available from within 4Pane, either from the help menu or by pressing F1; and also online at http://4pane.co.uk
+.PP
+.SH OPTIONS
+.TP
+.B \-d, \-\-home\-dir=<str>
+Use <str> as the home directory (optional)
+.TP
+.B \-c, \-\-config\-fpath=<str>
+Use this filepath as 4Pane's configuration file (optional. If the filepath doesn't exist, it will be created)
+.TP
+.B \-h, \-\-help
+Show a summary of options
+.br
+.SH AUTHOR
+4Pane was written by David Hart <david@4pane.co.uk>.
+.PP
+This manual page was written by David Hart <david@4pane.co.uk>,
+(but may be used by others).
--
2.1.0

View file

@ -0,0 +1,114 @@
From 3b55430a83dd521dbc7633b3416c2cb54849f243 Mon Sep 17 00:00:00 2001
From: dghart <dghart@users.sourceforge.net>
Date: Thu, 18 Dec 2014 12:06:26 +0000
Subject: [PATCH 3/4] Add an appdata file: see
https://sourceforge.net/p/fourpane/feature-requests/10/
---
.build/4Pane.bkl | 15 ++++++++++++---
4Pane.appdata.xml | 28 ++++++++++++++++++++++++++++
Makefile.in | 4 ++++
3 files changed, 44 insertions(+), 3 deletions(-)
create mode 100644 4Pane.appdata.xml
diff --git a/.build/4Pane.bkl b/.build/4Pane.bkl
index 6ec38d9..8b184da 100755
--- a/.build/4Pane.bkl
+++ b/.build/4Pane.bkl
@@ -153,6 +153,12 @@
ln -fs 4Pane $(DESTDIR)$(BINDIR)/4pane ;\
fi;
</command>
+ <!-- Install 4Pane.appdata.xml if the destination dir exists -->
+ <command>
+ @if test -d /usr/share/appdata/ ; then \
+ cp $(DESTDIR)4Pane.appdata.xml /usr/share/appdata/ ;\
+ fi;
+ </command>
<!-- Since 2009, .desktops without exec permissions are considered insecure, so chmod it too -->
<command>
@if test $(desktop) = yes || test $(desktop) = install_only ; then \
@@ -164,18 +170,21 @@
</command>
</modify-target>
- <!-- Extend "uninstall" to delete the symlink and desktop shortcut -->
+ <!-- Extend "uninstall" to delete the symlink, desktop shortcut and 4Pane.appdata.xml -->
<modify-target target="uninstall">
<command>
@if test $(symlink) = yes || test $(symlink) = uninstall_only; then \
rm -f $(DESTDIR)$(BINDIR)/4pane ;\
fi;
- </command>
+ </command>
+ <command>
+ @rm -f /usr/share/appdata/4Pane.appdata.xml ;
+ </command>
<command>
@if test $(desktop) = yes || test $(desktop) = uninstall_only; then \
rm -f ~/Desktop/4Pane.desktop ;\
fi;
- </command>
+ </command>
</modify-target>
</my_exe>
diff --git a/4Pane.appdata.xml b/4Pane.appdata.xml
new file mode 100644
index 0000000..918ecf5
--- /dev/null
+++ b/4Pane.appdata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2014 David Hart <david@4Pane.co.uk> -->
+<component type="desktop">
+ <id>4Pane.desktop</id>
+ <metadata_license>CC0-1.0</metadata_license>
+ <project_license>GPL-3.0</project_license>
+ <name>4Pane</name>
+ <summary>File manager</summary>
+ <description>
+ <p>
+ 4Pane is a highly configurable Linux filemanager. It has dual twin-panes,
+ each of which has a directory tree-view pane and a detailed-list pane for
+ files.
+ </p>
+ <p>
+ In addition to standard file manager things, it offers multiple undo and redo
+ of most operations (including deletions), archive management including
+ 'virtual browsing' inside archives, multiple renaming/duplication of files,
+ a terminal emulator and user-defined tools.
+ </p>
+ </description>
+ <screenshots>
+ <screenshot type="default">
+ <image>http://www.4Pane.co.uk/4Pane624x351.png</image>
+ </screenshot>
+ </screenshots>
+ <url type="homepage">http://www.4pane.co.uk</url>
+</component>
diff --git a/Makefile.in b/Makefile.in
index 7a7b8b2..19ae920 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -106,6 +106,9 @@ install: install_4Pane
@if test $(symlink) = yes || test $(symlink) = install_only ; then \
ln -fs 4Pane $(DESTDIR)$(bindir)/4pane ;\
fi;
+ @if test -d /usr/share/appdata/ ; then \
+ cp $(DESTDIR)4Pane.appdata.xml /usr/share/appdata/ ;\
+ fi;
@if test $(desktop) = yes || test $(desktop) = install_only ; then \
if test -d ~/Desktop/ ; then \
cp -up rc/4Pane.desktop ~/Desktop/4Pane.desktop ;\
@@ -142,6 +145,7 @@ uninstall: uninstall_4Pane
@if test $(symlink) = yes || test $(symlink) = uninstall_only; then \
rm -f $(DESTDIR)$(bindir)/4pane ;\
fi;
+ @rm -f /usr/share/appdata/4Pane.appdata.xml ;
@if test $(desktop) = yes || test $(desktop) = uninstall_only; then \
rm -f ~/Desktop/4Pane.desktop ;\
fi;
--
2.1.0

View file

@ -0,0 +1,78 @@
From 1147a5bfa2283df5b98df01c6174203b801e04ea Mon Sep 17 00:00:00 2001
From: dghart <dghart@users.sourceforge.net>
Date: Fri, 19 Dec 2014 12:34:08 +0000
Subject: [PATCH 4/4] Correct the use of DESTDIR in the last commit
---
.build/4Pane.bkl | 17 +++++++++--------
Makefile.in | 5 +++--
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/.build/4Pane.bkl b/.build/4Pane.bkl
index 8b184da..f018318 100755
--- a/.build/4Pane.bkl
+++ b/.build/4Pane.bkl
@@ -136,9 +136,9 @@
<!-- Extra compilation targets for non-system bzip2 builds -->
<!-- In theory this should 'ifdef' the bz targets and object. In practice it doesn't: -->
<!-- the if...endif follow the targets, not surround them; and the objects aren't affected at all -->
- <fragment format="autoconf">ifneq ($(BZIP2_FLAGS),-DUSE_SYSTEM_BZIP2)</fragment>
- <sources>$(fileList(['sdk/bzip/*.c']))</sources>
- <fragment format="autoconf">endif</fragment>
+ <fragment format="autoconf">ifneq ($(BZIP2_FLAGS),-DUSE_SYSTEM_BZIP2)</fragment>
+ <sources>$(fileList(['sdk/bzip/*.c']))</sources>
+ <fragment format="autoconf">endif</fragment>
<!-- This is the altered "install to", that doesn't happen if the install_app option is 'no' or 'uninstall_only' -->
<cond-install-to>$(BINDIR)</cond-install-to>
@@ -156,7 +156,8 @@
<!-- Install 4Pane.appdata.xml if the destination dir exists -->
<command>
@if test -d /usr/share/appdata/ ; then \
- cp $(DESTDIR)4Pane.appdata.xml /usr/share/appdata/ ;\
+ $(INSTALL_DIR) $(DESTDIR)/usr/share/appdata/ ;\
+ cp 4Pane.appdata.xml $(DESTDIR)/usr/share/appdata/ ;\
fi;
</command>
<!-- Since 2009, .desktops without exec permissions are considered insecure, so chmod it too -->
@@ -177,10 +178,10 @@
rm -f $(DESTDIR)$(BINDIR)/4pane ;\
fi;
</command>
- <command>
- @rm -f /usr/share/appdata/4Pane.appdata.xml ;
- </command>
- <command>
+ <command>
+ @rm -f $(DESTDIR)/usr/share/appdata/4Pane.appdata.xml ;
+ </command>
+ <command>
@if test $(desktop) = yes || test $(desktop) = uninstall_only; then \
rm -f ~/Desktop/4Pane.desktop ;\
fi;
diff --git a/Makefile.in b/Makefile.in
index 19ae920..c11e531 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -107,7 +107,8 @@ install: install_4Pane
ln -fs 4Pane $(DESTDIR)$(bindir)/4pane ;\
fi;
@if test -d /usr/share/appdata/ ; then \
- cp $(DESTDIR)4Pane.appdata.xml /usr/share/appdata/ ;\
+ $(INSTALL_DIR) $(DESTDIR)/usr/share/appdata/ ;\
+ cp 4Pane.appdata.xml $(DESTDIR)/usr/share/appdata/ ;\
fi;
@if test $(desktop) = yes || test $(desktop) = install_only ; then \
if test -d ~/Desktop/ ; then \
@@ -145,7 +146,7 @@ uninstall: uninstall_4Pane
@if test $(symlink) = yes || test $(symlink) = uninstall_only; then \
rm -f $(DESTDIR)$(bindir)/4pane ;\
fi;
- @rm -f /usr/share/appdata/4Pane.appdata.xml ;
+ @rm -f $(DESTDIR)/usr/share/appdata/4Pane.appdata.xml ;
@if test $(desktop) = yes || test $(desktop) = uninstall_only; then \
rm -f ~/Desktop/4Pane.desktop ;\
fi;
--
2.1.0

View file

@ -8,7 +8,7 @@
Name: 4Pane
Version: 3.0
Release: 3%{?dist}
Release: 4%{?dist}
Summary: Multi-pane, detailed-list file manager
License: GPLv3
@ -16,6 +16,11 @@ URL: http://www.4pane.co.uk/
Source0: http://downloads.sourceforge.net/fourpane/4pane-%{version}.tar.gz
# https://sourceforge.net/p/fourpane/discussion/767206/thread/9daf0cda/
Patch0: 4Pane-HEAD-0001-When-getting-a-pointer-to-a-menubar-menu-don-t-searc.patch
# http://sourceforge.net/p/fourpane/feature-requests/9/
Patch1: 4Pane-HEAD-0002-Add-the-man-page-to-git.patch
# http://sourceforge.net/p/fourpane/feature-requests/10/
Patch2: 4Pane-HEAD-0003-Add-an-appdata-file-see-https-sourceforge.net-p-four.patch
Patch3: 4Pane-HEAD-0004-Correct-the-use-of-DESTDIR-in-the-last-commit.patch
BuildRequires: bzip2-devel
BuildRequires: xz-devel
@ -35,6 +40,9 @@ tools.
%prep
%setup -q -n 4pane-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
sed -i -e '\@Icon=@s|^.*$|Icon=%{name}|' rc/%{name}.desktop
@ -62,6 +70,9 @@ install -cpm 644 bitmaps/%{name}Icon48.png %{buildroot}%{_datadir}/icons/hicolor
desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
mkdir -p %{buildroot}%{_mandir}/man1
install -cpm 644 4Pane.1 %{buildroot}%{_mandir}/man1/
%find_lang %{name}
# Once remove document and let %%doc re-install them
@ -88,11 +99,17 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_bindir}/4pane
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1*
%{_datadir}/appdata/%{name}.appdata.xml
%{_datadir}/%{name}/
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}*
%changelog
* Sun Dec 21 2014 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.0-4
- Add man page, appdata
* Thu Dec 11 2014 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.0-3
- Replace Patch0 with the one revised by the upstream