commit 82a5aa8d92407b2c36ca2108465ce72a33fe06c7
Author: Jakub Bogusz <[email protected]>
Date: Sat Jan 18 09:09:36 2014 +0100
- added destdir patch, package gtk-doc apidocs in gtk-doc specific dir,
package in -apidocs
- verbose lib files
gdome2-destdir.patch | 15 +++++++++++++++
gdome2.spec | 46 +++++++++++++++++++++++++++++++++-------------
2 files changed, 48 insertions(+), 13 deletions(-)
---
diff --git a/gdome2.spec b/gdome2.spec
index 22136be..80458c4 100644
--- a/gdome2.spec
+++ b/gdome2.spec
@@ -14,14 +14,16 @@ Source0:
http://gdome2.cs.unibo.it/tarball/%{name}-%{version}.tar.gz
Patch0: %{name}-glib2.patch
Patch1: %{name}-build_fix.patch
Patch2: format-security.patch
+Patch3: %{name}-destdir.patch
URL: http://gdome2.cs.unibo.it/
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: glib2-devel >= 2.2.0
BuildRequires: libtool
-BuildRequires: libxml2-devel >= 2.4.26
+BuildRequires: libxml2-devel >= 1:2.4.26
BuildRequires: pkgconfig
-Requires: libxml2 >= 2.4.26
+Requires: glib2 >= 2.2.0
+Requires: libxml2 >= 1:2.4.26
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -65,7 +67,7 @@ Summary(pl.UTF-8): Pliki nagłówkowe gdome2
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: glib2-devel >= 2.2.0
-Requires: libxml2-devel >= 2.4.26
+Requires: libxml2-devel >= 1:2.4.26
%description devel
This package contains the header files and configuration scripts for
@@ -121,21 +123,36 @@ This package contains static libraries for developing
with gdome2.
Pakiet ten zawiera statyczne biblioteki potrzebne do rozwijania
oprogramowania opartego o gdome2.
+%package apidocs
+Summary: API documentation for gdome2 library
+Summary(pl.UTF-8): Dokumentacja API biblioteki gdome2
+Group: Documentation
+
+%description apidocs
+API documentation for gdome2 library.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API biblioteki gdome2.
+
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
+# disable glib 1.x in order to force 2.x
echo 'AM_DEFUN([AM_PATH_GLIB], [$3])' >> acinclude.m4
%build
%{__libtoolize}
%{__aclocal}
%{__autoconf}
+%{__autoheader}
%{__automake}
%configure \
- %{!?with_static_libs:--disable-static}
+ %{!?with_static_libs:--disable-static} \
+ --with-html-dir=%{_gtkdocdir}
%{__make}
@@ -154,23 +171,26 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
%doc AUTHORS MAINTAINERS ChangeLog README
-%attr(755,root,root) %{_libdir}/lib*.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/lib*.so.0
+%attr(755,root,root) %{_libdir}/libgdome.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgdome.so.0
%files devel
%defattr(644,root,root,755)
-%doc gtk-doc/html/*.html
%attr(755,root,root) %{_bindir}/gdome-config
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
-%attr(755,root,root) %{_libdir}/*.sh
+%attr(755,root,root) %{_libdir}/libgdome.so
+%{_libdir}/libgdome.la
+%attr(755,root,root) %{_libdir}/gdomeConf.sh
%{_includedir}/libgdome
%{_mandir}/man1/gdome-config.1*
-%{_aclocaldir}/%{name}.m4
-%{_pkgconfigdir}/%{name}.pc
+%{_aclocaldir}/gdome2.m4
+%{_pkgconfigdir}/gdome2.pc
%if %{with static_libs}
%files static
%defattr(644,root,root,755)
-%{_libdir}/*.a
+%{_libdir}/libgdome.a
%endif
+
+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/gdome2-%{version}
diff --git a/gdome2-destdir.patch b/gdome2-destdir.patch
new file mode 100644
index 0000000..d1dc49c
--- /dev/null
+++ b/gdome2-destdir.patch
@@ -0,0 +1,15 @@
+--- gdome2-0.8.1/gtk-doc/Makefile.am.orig 2002-04-04 08:58:04.000000000
+0200
++++ gdome2-0.8.1/gtk-doc/Makefile.am 2014-01-18 08:52:44.335300888 +0100
+@@ -33,9 +33,9 @@
+ rm -rf sgml html gdome2-decl-list.txt gdome2-decl.txt
+
+ install-data-local:
+- -install -d -m 0755 $(TARGET_DIR)
+- -install -m 0644 $(srcdir)/html/*.html $(TARGET_DIR)
+- -install -m 0644 $(srcdir)/html/index.sgml $(TARGET_DIR)
++ -install -d -m 0755 $(DESTDIR)$(TARGET_DIR)
++ -install -m 0644 $(srcdir)/html/*.html $(DESTDIR)$(TARGET_DIR)
++ -install -m 0644 $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR)
+ -(cd $(DESTDIR); gtkdoc-fixxref --module=$(DOC_MODULE)
--html-dir=$(HTML_DIR))
+
+ .PHONY : html sgml templates scan
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gdome2.git/commitdiff/82a5aa8d92407b2c36ca2108465ce72a33fe06c7
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
