2007-11-15 Damien Carbery <
[email protected]>
* SFEgurlchecker.spec: Add patch, 02-doc-fixes, to fix doc building
issues. Add support for building on an Indiana system.
* patches/gurlchecker-02-doc-fixes.diff: Added.
* SFEatomix.spec, SFEconsolekit.spec, SFEcoreutils.spec: Add support
for building on an Indiana system.
--- a/ChangeLog Wed Nov 14 18:18:31 2007 +0000
+++ b/ChangeLog Thu Nov 15 15:34:18 2007 +0000
@@ -1,3 +1,11 @@
+2007-11-15 Damien Carbery <[email protected]>
+
+ * SFEgurlchecker.spec: Add patch, 02-doc-fixes, to fix doc building
+ issues. Add support for building on an Indiana system.
+ * patches/gurlchecker-02-doc-fixes.diff: Added.
+ * SFEatomix.spec, SFEconsolekit.spec, SFEcoreutils.spec: Add support
+ for building on an Indiana system.
+
2007-11-14 Albert Lee <[email protected]>
* SFEsvk.spec: Fix typo in wrapper script
--- a/SFEatomix.spec Wed Nov 14 18:18:31 2007 +0000
+++ b/SFEatomix.spec Thu Nov 15 15:34:18 2007 +0000
@@ -19,6 +19,10 @@
Requires: SUNWgnome-component
Requires: SUNWlibms
Requires: SUNWlxml
+%if %option_with_gnu_iconv
+Requires: SUNWgnu-libiconv
+Requires: SUNWgnu-gettext
+%endif
BuildRequires: SUNWgnome-libs-devel
BuildRequires: SUNWgnome-base-libs-devel
BuildRequires: SUNWgnome-component-devel
@@ -34,6 +38,9 @@
CPUS=1
fi
export CFLAGS="%optflags -I/usr/sfw/include -DANSICPP"
+%if %option_with_gnu_iconv
+export CFLAGS="$CFLAGS -I/usr/gnu/include -L/usr/gnu/lib -R/usr/gnu/lib -lintl"
+%endif
export RPM_OPT_FLAGS="$CFLAGS"
export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
export LDFLAGS="%_ldflags"
--- a/SFEconsolekit.spec Wed Nov 14 18:18:31 2007 +0000
+++ b/SFEconsolekit.spec Thu Nov 15 15:34:18 2007 +0000
@@ -27,6 +27,21 @@
Requires: SUNWdbus
Requires: SUNWdbus-bindings
Requires: %name-root
+%if %option_with_gnu_iconv
+Requires: SUNWgnu-libiconv
+Requires: SUNWgnu-gettext
+%else
+Requires: SUNWuiu8
+%endif
+%if %option_with_fox
+Requires: FSWxorg-clientlibs
+Requires: FSWxwrtl
+BuildRequires: FSWxorg-headers
+%else
+Requires: SUNWxwrtl
+Requires: SUNWxwplt
+Requires: SUNWxorg-clientlibs
+%endif
%package root
Summary: %{summary} - / filesystem
@@ -41,14 +56,6 @@
%include default-depend.inc
Requires: %name
-%if %build_l10n
-%package l10n
-Summary: %{summary} - l10n files
-SUNW_BaseDir: %{_basedir}
-%include default-depend.inc
-Requires: %{name}
-%endif
-
%prep
%setup -q -n ConsoleKit-%version
%patch1 -p1
@@ -60,6 +67,13 @@
CPUS=1
fi
export CFLAGS="%optflags -I/usr/sfw/include -DANSICPP"
+%if %option_with_gnu_iconv
+export CFLAGS="$CFLAGS -I/usr/gnu/include -L/usr/gnu/lib -R/usr/gnu/lib -lintl"
+%endif
+%if %option_with_fox
+# for <X11/Xlib.h>
+export CFLAGS="$CFLAGS -I/usr/X11/include"
+%endif
export RPM_OPT_FLAGS="$CFLAGS"
export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
export CPPFLAGS="-I/usr/sfw/include"
@@ -87,12 +101,6 @@
make install DESTDIR=$RPM_BUILD_ROOT
rm $RPM_BUILD_ROOT%{_libdir}/lib*.la
-%if %build_l10n
-%else
-# REMOVE l10n FILES
-rm -rf $RPM_BUILD_ROOT%{_datadir}/locale
-%endif
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -126,12 +134,6 @@
%dir %attr (0755, root, other) %{_libdir}/pkgconfig
%{_libdir}/pkgconfig/*
-%if %build_l10n
-%files l10n
-%defattr (-, root, bin)
-%dir %attr (0755, root, sys) %{_datadir}
-%attr (-, root, other) %{_datadir}/locale
-%endif
%changelog
* Tue Sep 18 2007 - [email protected]
--- a/SFEcoreutils.spec Wed Nov 14 18:18:31 2007 +0000
+++ b/SFEcoreutils.spec Thu Nov 15 15:34:18 2007 +0000
@@ -20,6 +20,13 @@
Requires: SUNWpostrun
BuildRequires: SFEautoconf
BuildRequires: SFEautomake
+%if %option_with_gnu_iconv
+Requires: SUNWgnu-libiconv
+Requires: SUNWgnu-gettext
+%else
+Requires: SUNWuiu8
+%endif
+
%if %build_l10n
%package l10n
@@ -41,6 +48,9 @@
# export PATH=/usr/bin:$PATH
export CFLAGS="%optflags"
+%if %option_with_gnu_iconv
+export CFLAGS="$CFLAGS -I/usr/gnu/include -L/usr/gnu/lib -R/usr/gnu/lib -lintl"
+%endif
export LDFLAGS="%_ldflags"
glib-gettextize -f
--- a/SFEgurlchecker.spec Wed Nov 14 18:18:31 2007 +0000
+++ b/SFEgurlchecker.spec Thu Nov 15 15:34:18 2007 +0000
@@ -9,10 +9,11 @@
%define src_url http://labs.libre-entreprise.org/frs/download.php/547
Name: SFEgurlchecker
-Summary: Gnome URL Checker
+Summary: Graphical Web Link Checker
Version: 0.10.1
Source: %{src_url}/%{src_name}-%{version}.tar.gz
Patch1: gurlchecker-01-wall.diff
+Patch2: gurlchecker-02-doc-fixes.diff
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%include default-depend.inc
@@ -25,10 +26,17 @@
Requires: SFEclamav
BuildRequires: SFEgnet-devel
Requires: SFEgnet
+%if %option_with_gnu_iconv
+Requires: SUNWgnu-libiconv
+Requires: SUNWgnu-gettext
+%else
+Requires: SUNWuiu8
+%endif
%prep
%setup -q -n %{src_name}-%version
%patch1 -p1
+%patch2 -p1
%build
CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
@@ -38,10 +46,14 @@
export CPPFLAGS="-D__sun__"
export CFLAGS="%optflags"
+%if %option_with_gnu_iconv
+export CFLAGS="$CFLAGS -I/usr/gnu/include -L/usr/gnu/lib -R/usr/gnu/lib -lintl"
+%endif
export LDFLAGS="%_ldflags"
aclocal
libtoolize --copy --force
+intltoolize --copy --force --automake
automake -a -f
autoconf -f
./configure --prefix=%{_prefix} \
@@ -94,5 +106,9 @@
%{_datadir}/locale
%changelog
+* Thu Nov 15 2007 - [email protected]
+- Add patch, 02-doc-fixes, to fix doc building issues. Add support for building
+ on an Indiana system.
+
* Fri Jul 27 2007 - [email protected]
- Initial spec
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gurlchecker-02-doc-fixes.diff Thu Nov 15 15:34:18 2007 +0000
@@ -0,0 +1,28 @@
+--- gurlchecker-0.10.1/man/make-doc.orig 2007-11-15 15:14:24.155393000 +0000
++++ gurlchecker-0.10.1/man/make-doc 2007-11-15 15:14:45.357135000 +0000
+@@ -1,12 +1,12 @@
+ #!/bin/bash
+
+-if [ `which docbook-to-man` ]
++if [ -f "`which docbook-to-man`" ]
+ then
+ docbook-to-man $1 > $2
+-elif [ `which db2man` ]
++elif [ -f "`which db2man`" ]
+ then
+ db2man $1 > $2
+-elif [ `which docbook2man` ]
++elif [ -f "`which docbook2man`" ]
+ then
+ docbook2man $1 > $2
+ fi
+--- gurlchecker-0.10.1/doc/gurlchecker-sections.txt.orig 2007-11-15 15:17:23.883574000 +0000
++++ gurlchecker-0.10.1/doc/gurlchecker-sections.txt 2007-11-15 15:17:34.170930000 +0000
+@@ -111,7 +111,6 @@
+ UC_TIMEOUTS_BLOCKED_DEFAULT
+ UC_USER_AGENT
+ UCStatusCode
+-UCSearchState
+ UCHTMLTag
+ UCLinkProperties
+ GHashNode