- added bcond for glib2 (glib 1.2 by default - acc. to ChangeLog glib2 is not

  supported yet... but builds)
- removed autogenerated SONAME symlink, moved base docs to base

Changed files:
    gdome2.spec -> 1.13

diff --git a/gdome2.spec b/gdome2.spec
index f71a3de9029da109687bb06fec81aa10a099f89a..5cae1491b5d356b20113309d47fdc09cb0f7feb8 100644 (file)
--- a/gdome2.spec
+++ b/gdome2.spec
@@ -1,3 +1,8 @@
+#
+# Conditional build:
+# (to be changed to bcond_with when glib2 support is finished)
+%bcond_without glib1   # don't use glib 1.2 instead of 2.x
+#
 Summary:       DOM level2 library for accessing XML files
 Summary(pl):   Biblioteka dostêpu do plików XML, DOM poziom 2
 Name:          gdome2
@@ -10,11 +15,13 @@ Source0:    http://gdome2.cs.unibo.it/tarball/%{name}-%{version}.tar.gz
 # Source0-md5: 143db4b396b968288c154332cae186c8
 Patch0:                %{name}-ac.patch
 BuildRequires: libxml2-devel >= 2.4.26
-BuildRequires: glib-devel >= 1.2.10
+%{!?with_glib1:BuildRequires:  glib2-devel}
+%{?with_glib1:BuildRequires:   glib-devel >= 1.2.10}
+BuildRequires: glib2-devel
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libtool
-Requires:      glib >= 1.2.10
+%{?with_glib1:Requires:        glib >= 1.2.10}
 Requires:      libxml2 >= 2.4.26
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -58,7 +65,8 @@ Summary:      Development files for gdome2
 Summary(pl):   Pliki nag³ówkowe gdome2
 Group:         Development/Libraries
 Requires:      %{name} = %{version}
-Requires:      glib-devel >= 1.2.10
+%{!?with_glib1:Requires:       glib2-devel}
+%{?with_glib1:Requires:        glib-devel >= 1.2.10}
 Requires:      libxml2-devel >= 2.4.21
 
 %description devel
@@ -82,9 +90,9 @@ full implementation of all the DOM Level2 standard.
 Now gdome2 also partially supports the XPath module from the DOM level
 3 drafts.
 
-%description -l pl
+%description devel -l pl
 Pakiet ten zawiera pliki nag³ówkowe oraz skrypty konfiguracyjne
-potrzebne do rozwiajania oprogramowania opartego o gdome2.
+potrzebne do rozwijania oprogramowania opartego o gdome2.
 
 gdome2 jest szybk±, lekk± i kompletn± implementacj± DOM poziom 2
 opart± o libxml2. Pomimo, ¿e gdome2 zosta³o napisane z my¶l± o
@@ -106,15 +114,13 @@ gdome2 wspiera r
 Summary:       Static libraries for gdome2
 Summary(pl):   Biblioteki statyczne dla gdome2
 Group:         Development/Libraries
-Requires:      %{name} = %{version}
-Requires:      glib-devel >= 1.2.10
-Requires:      libxml2-devel >= 2.4.19
+Requires:      %{name}-devel = %{version}
 
 %description static
 This package contains static libraries for developing with gdome2.
 
 %description static -l pl
-Pakiet ten zawiera statyczne biblioteki potrzebne do rozwiajania
+Pakiet ten zawiera statyczne biblioteki potrzebne do rozwijania
 oprogramowania opartego o gdome2.
 
 %prep
@@ -127,14 +133,16 @@ rm -f missing
 %{__aclocal}
 %{__autoconf}
 %{__automake}
-%configure
+%configure \
+       %{!?with_glib1:GLIB_2=yes}
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%{__make} install \
+        DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -144,16 +152,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so.*
+%doc AUTHORS MAINTAINERS ChangeLog README
+%attr(755,root,root) %{_libdir}/lib*.so.*.*.*
 
 %files devel
 %defattr(644,root,root,755)
-%doc AUTHORS MAINTAINERS ChangeLog README gtk-doc/html/*.html
+%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
-%{_includedir}/*
+%{_includedir}/libgdome
 %{_mandir}/man1/gdome-config.1*
 %{_aclocaldir}/%{name}.m4
 %{_pkgconfigdir}/%{name}.pc