[packages/planner] - gtk-doc 1.25 does not generate index.sgml - fix install - rel 4

baggins baggins at pld-linux.org
Thu May 5 18:58:47 CEST 2016


commit c14977594381402522a8e412bbb48ff16408d3f1
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu May 5 18:58:27 2016 +0200

    - gtk-doc 1.25 does not generate index.sgml
    - fix install
    - rel 4

 gtk-doc-1.25.patch | 11 +++++++++++
 planner.spec       | 13 ++++++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)
---
diff --git a/planner.spec b/planner.spec
index 1b277f1..1410d07 100644
--- a/planner.spec
+++ b/planner.spec
@@ -8,13 +8,14 @@ Summary(pl.UTF-8):	System zarządzania projektem pomocny przy planowaniu i śled
 Summary(pt_BR.UTF-8):	Planner é um programa para gerenciamento de projetos
 Name:		planner
 Version:	0.14.6
-Release:	3
+Release:	4
 License:	GPL v2+
 Group:		X11/Applications
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/planner/0.14/%{name}-%{version}.tar.xz
 # Source0-md5:	605c589f2c9ec695df0ae79aed3e2e3b
 Patch0:		%{name}-desktop.patch
 Patch1:		pythonlib-in-libdir.patch
+Patch2:		gtk-doc-1.25.patch
 URL:		https://live.gnome.org/Planner/
 BuildRequires:	GConf2-devel >= 2.18.0.1
 BuildRequires:	autoconf >= 2.54
@@ -131,6 +132,7 @@ Wiązanie Pythona do biblioteki Planner.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 cp -f /usr/share/automake/config.sub .
@@ -164,10 +166,11 @@ install -d $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 	omf_dest_dir=%{_omf_dest_dir}
 
 # useless - modules loaded through gmodule
-rm -f $RPM_BUILD_ROOT%{_datadir}/mime/application/*.xml
-rm -f $RPM_BUILD_ROOT%{_datadir}/mime/{XMLnamespaces,globs,magic}
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/{,*/}*.la
-rm -f $RPM_BUILD_ROOT%{py_sitedir}/*.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/*/*.la
+%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/*.la
+
+# rpm5 does not line when this directory exists prior to packaging docs
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
 %find_lang %{name} --with-gnome --all-name
 
diff --git a/gtk-doc-1.25.patch b/gtk-doc-1.25.patch
new file mode 100644
index 0000000..c633e3e
--- /dev/null
+++ b/gtk-doc-1.25.patch
@@ -0,0 +1,11 @@
+--- planner-0.14.6/docs/libplanner/Makefile.am~	2010-10-14 21:41:27.000000000 +0200
++++ planner-0.14.6/docs/libplanner/Makefile.am	2016-05-05 18:52:53.472593724 +0200
+@@ -165,8 +165,6 @@
+ 	    echo '-- Installing '$$i ; \
+ 	    $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
+ 	  done; \
+-	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
+-	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
+ 	fi)
+ 
+ uninstall-local:
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/planner.git/commitdiff/c14977594381402522a8e412bbb48ff16408d3f1



More information about the pld-cvs-commit mailing list