guix: Make emacs-magit depend on emacs-ghub and emacs-magit-popup

3 files changed, 146 insertions, 13 deletions

diff --git a/guix/emacs-ghub/emacs-ghub.spec b/guix/emacs-ghub/emacs-ghub.spec
new file mode 100644
index 0000000..3a22112
--- /dev/null
+++ b/guix/emacs-ghub/emacs-ghub.spec
@@ -0,0 +1,64 @@
+%global pkg ghub
+%global pkgname Ghub
+%global commit 11c07daf7abcaf2d4cc2a5f007772506202c6d1f
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+
+Name:           emacs-%{pkg}
+Version:        1.3.1
+Release:        0.1.20180312git%{shortcommit}%{?dist}
+Summary:        Minuscule GitHub client library for Emacs
+
+License:        GPLv3+
+URL:            https://magit.vc
+Source0:        https://github.com/magit/ghub/archive/%{commit}/%{name}-%{commit}.tar.gz
+
+BuildArch:      noarch
+BuildRequires:  emacs, texinfo
+Requires:       emacs(bin) >= %{_emacs_version}
+Recommends:     git
+
+%description
+%{pkgname} is an add-on package for GNU Emacs. It provides basic support for
+using the Github REST (v3) and GraphQL (v4) APIs from Emacs packages.
+
+
+%prep
+%autosetup -n ghub-%{commit} -p1
+
+
+%build
+%make_build
+
+
+%install
+mkdir -p %{buildroot}%{_emacs_sitelispdir} %{buildroot}%{_emacs_sitestartdir}
+install -m 755 -d %{buildroot}%{_emacs_sitelispdir}/ghub
+install -m 644 ghub.el ghub.elc %{buildroot}%{_emacs_sitelispdir}/ghub/
+install -m 644 ghub-autoloads.el %{buildroot}%{_emacs_sitestartdir}/ghub.el
+mkdir -p %{buildroot}%{_infodir}
+gzip -9 < ghub.info > %{buildroot}%{_infodir}/ghub.info.gz
+
+
+%post
+/sbin/install-info %{_infodir}/ghub.info.gz %{_infodir}/dir || :
+
+
+%preun
+if [ "$1" = 0 ]; then
+    /sbin/install-info --del %{_infodir}/ghub.info.gz %{_infodir}/dir || :
+fi
+
+
+%files
+%doc README.md ghub.org
+%dir %{_emacs_sitelispdir}/ghub
+%{_emacs_sitelispdir}/ghub/ghub.el
+%{_emacs_sitelispdir}/ghub/ghub.elc
+%{_emacs_sitestartdir}/ghub.el
+%{_infodir}/ghub.info.gz
+
+
+
+%changelog
+* Tue Mar 13 2018 Ting-Wei Lan <lantw44@gmail.com> - 1.3.1-0.1.20180312git11c07da
+- Initial packaging
diff --git a/guix/emacs-magit-popup/emacs-magit-popup.spec b/guix/emacs-magit-popup/emacs-magit-popup.spec
new file mode 100644
index 0000000..7ebf3c4
--- /dev/null
+++ b/guix/emacs-magit-popup/emacs-magit-popup.spec
@@ -0,0 +1,67 @@
+%global pkg magit-popup
+%global pkgname Magit-Popup
+
+Name:           emacs-%{pkg}
+Version:        2.12.2
+Release:        1%{?dist}
+Summary:        Define prefix-infix-suffix command combos for Emacs
+
+License:        GPLv3+
+URL:            https://magit.vc
+Source0:        https://github.com/magit/magit-popup/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+
+BuildArch:      noarch
+BuildRequires:  emacs, texinfo
+BuildRequires:  emacs-dash
+Requires:       emacs(bin) >= %{_emacs_version}
+Requires:       emacs-dash
+
+%description
+%{pkgname} is an add-on package for GNU Emacs. It implements a generic interface
+for toggling switches and setting options and then invoking an Emacs command
+which does something with these arguments.
+
+
+%prep
+%autosetup -n magit-popup-%{version} -p1
+
+
+%build
+%make_build LOAD_PATH='-L %{_emacs_sitelispdir}/dash'
+
+
+%install
+mkdir -p %{buildroot}%{_emacs_sitelispdir} %{buildroot}%{_emacs_sitestartdir}
+install -m 755 -d %{buildroot}%{_emacs_sitelispdir}/magit-popup
+install -m 644 magit-popup.el magit-popup.elc \
+    %{buildroot}%{_emacs_sitelispdir}/magit-popup/
+install -m 644 magit-popup-autoloads.el \
+    %{buildroot}%{_emacs_sitestartdir}/magit-popup.el
+mkdir -p %{buildroot}%{_infodir}
+gzip -9 < magit-popup.info > %{buildroot}%{_infodir}/magit-popup.info.gz
+
+
+%post
+/sbin/install-info %{_infodir}/magit-popup.info.gz %{_infodir}/dir || :
+
+
+%preun
+if [ "$1" = 0 ]; then
+    /sbin/install-info --del %{_infodir}/magit-popup.info.gz %{_infodir}/dir || :
+fi
+
+
+%files
+%license LICENCE
+%doc AUTHORS.md README.md magit-popup.org
+%dir %{_emacs_sitelispdir}/magit-popup
+%{_emacs_sitelispdir}/magit-popup/magit-popup.el
+%{_emacs_sitelispdir}/magit-popup/magit-popup.elc
+%{_emacs_sitestartdir}/magit-popup.el
+%{_infodir}/magit-popup.info.gz
+
+
+
+%changelog
+* Tue Mar 13 2018 Ting-Wei Lan <lantw44@gmail.com> - 2.12.2-1
+- Initial packaging
diff --git a/guix/emacs-magit/emacs-magit.spec b/guix/emacs-magit/emacs-magit.spec
index ea248c4..00390fd 100644
--- a/guix/emacs-magit/emacs-magit.spec
+++ b/guix/emacs-magit/emacs-magit.spec
@@ -13,19 +13,19 @@
 
 Name:           emacs-%{pkg}
 Version:        2.11.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Emacs interface to the most common Git operations
 
-Group:          Applications/Editors
 License:        GPLv3+
 URL:            https://magit.vc
 
 Source0:        https://github.com/magit/magit/releases/download/%{version}/magit-%{version}.tar.gz
 
 BuildArch:      noarch
-BuildRequires:  emacs, emacs-dash, emacs-with-editor, git-core, texinfo
+BuildRequires:  emacs, git-core, texinfo
+BuildRequires:  emacs-dash, emacs-ghub, emacs-magit-popup, emacs-with-editor
 Requires:       emacs(bin) >= %{emacs_version}
-Requires:       emacs-dash, emacs-with-editor
+Requires:       emacs-dash, emacs-ghub, emacs-magit-popup, emacs-with-editor
 
 Obsoletes:      emacs-%{pkg}-el < 2.3.1-1
 Provides:       emacs-%{pkg}-el < 2.3.1-1
@@ -40,31 +40,29 @@ common operations convenient.
 
 %build
 %make_build \
-    MAKEINFO='makeinfo --no-split' \
-    LOAD_PATH='-L %{emacs_lispdir}/dash -L %{emacs_lispdir}/with-editor -L %{_builddir}/magit-%{version}/lisp -L .'
+    DASH_DIR=%{emacs_lispdir}/dash \
+    GHUB_DIR=%{emacs_lispdir}/ghub \
+    MAGIT_POPUP_DIR=%{emacs_lispdir}/magit-popup \
+    WITH_EDITOR_DIR=%{emacs_lispdir}/with-editor
 
 %install
-%make_install \
-    PREFIX=%{_prefix} docdir=%{_pkgdocdir} \
-    LOAD_PATH='-L %{emacs_lispdir}/dash -L %{emacs_lispdir}/with-editor -L %{_builddir}/magit-%{version}/lisp -L .'
+%make_install PREFIX=%{_prefix} docdir=%{_pkgdocdir}
 
 # clean up after magit's installer's assumptions
 mkdir -p $RPM_BUILD_ROOT%{emacs_startdir}
 mv $RPM_BUILD_ROOT%{emacs_lispdir}/magit/magit-autoloads.el \
     $RPM_BUILD_ROOT%{emacs_startdir}/emacs-magit-mode.el
 gzip -9 $RPM_BUILD_ROOT%{_infodir}/magit.info
-gzip -9 $RPM_BUILD_ROOT%{_infodir}/magit-popup.info
+rm $RPM_BUILD_ROOT%{_infodir}/magit-popup.info
 
 
 %post
 /sbin/install-info /usr/share/info/magit.info.gz /usr/share/info/dir
-/sbin/install-info /usr/share/info/magit-popup.info.gz /usr/share/info/dir
 
 
 %preun
 if [ "$1" = 0 ]; then
     /sbin/install-info --delete /usr/share/info/magit.info.gz /usr/share/info/dir
-    /sbin/install-info --delete /usr/share/info/magit-popup.info.gz /usr/share/info/dir
 fi
 
 
@@ -75,12 +73,16 @@ fi
 %{emacs_lispdir}/%{pkg}/*.elc
 %{emacs_startdir}/emacs-magit-mode.el
 %{_infodir}/magit.info.gz
-%{_infodir}/magit-popup.info.gz
 %dir %{emacs_lispdir}/%{pkg}
 %{_pkgdocdir}/AUTHORS.md
 
 
 %changelog
+* Mon Feb 26 2018 Ting-Wei Lan <lantw44@gmail.com> - 2.11.0-4
+- Add dependency on emacs-ghub and emacs-magit-popup
+- Remove magit-popup.info because it is already provided by emacs-magit-popup
+- Remove group tag because it is deprecated in Fedora
+
 * Mon Dec 11 2017 Ting-Wei Lan <lantw44@gmail.com> - 2.11.0-3
 - Use autosetup and make_build macros
 - Replace define with global