2007-10-22 Halton Huo <
[email protected]>
* SFEcmake.spec: Bump to 2.4.7
* SFEdante.spec: Add URL
* SFElibfribidi.spec: Spilit into fribidi.spec
* base-specs/abiword.spec:
(new) A lean and fast full-featured word processor
* base-specs/fribidi.spec:
(new) Library implementing the Unicode Bidirectional Algorithm
* patches/abiword-01-const-cast.diff: (added)
* patches/abiword-02-reinterpret-cast.diff: (added)
* patches/abiword-03-namespace-std.diff: (added)
* patches/abiword-04-suncc-map.diff: (added)
* patches/abiword-05-ut-xml-define.diff: (added)
* patches/abiword-06-define-func.diff: (added)
* patches/abiword-07-unistd.diff: (added)
--- a/ChangeLog Sun Oct 21 15:27:49 2007 +0000
+++ b/ChangeLog Mon Oct 22 10:21:19 2007 +0000
@@ -1,3 +1,20 @@
+2007-10-22 Halton Huo <[email protected]>
+
+ * SFEcmake.spec: Bump to 2.4.7
+ * SFEdante.spec: Add URL
+ * SFElibfribidi.spec: Spilit into fribidi.spec
+ * base-specs/abiword.spec:
+ (new) A lean and fast full-featured word processor
+ * base-specs/fribidi.spec:
+ (new) Library implementing the Unicode Bidirectional Algorithm
+ * patches/abiword-01-const-cast.diff: (added)
+ * patches/abiword-02-reinterpret-cast.diff: (added)
+ * patches/abiword-03-namespace-std.diff: (added)
+ * patches/abiword-04-suncc-map.diff: (added)
+ * patches/abiword-05-ut-xml-define.diff: (added)
+ * patches/abiword-06-define-func.diff: (added)
+ * patches/abiword-07-unistd.diff: (added)
+
2007-10-21 Petr Sobotka <[email protected]>
* SFEsarg.spec: Deleted dependency SFEsquid
--- a/SFEcmake.spec Sun Oct 21 15:27:49 2007 +0000
+++ b/SFEcmake.spec Mon Oct 22 10:21:19 2007 +0000
@@ -7,7 +7,7 @@
Name: SFEcmake
Summary: Cross platform make system
-Version: 2.4.6
+Version: 2.4.7
Source: http://www.cmake.org/files/v2.4/cmake-%{version}.tar.gz
URL: http://www.cmake.org
SUNW_BaseDir: %{_basedir}
@@ -57,5 +57,7 @@
%{_datadir}/doc
%changelog
+* Mon Oct 22 2007 - [email protected]
+- Bump to 2.4.7
* Mon Mar 19 2007 - [email protected]
- Initial spec
--- a/SFEdante.spec Sun Oct 21 15:27:49 2007 +0000
+++ b/SFEdante.spec Mon Oct 22 10:21:19 2007 +0000
@@ -10,6 +10,7 @@
Summary: Tool connecting to external networks via SOCKS.
Version: 1.1.19
License: BSD/Carnegie Mellon University
+URL: http://www.inet.no/dante/
Source: ftp://ftp.inet.no/pub/socks/dante-%{version}.tar.gz
Source1: ftp://ftp.inet.no/pub/socks/extracted/example/socks.conf
SUNW_BaseDir: %{_basedir}
--- a/SFElibfribidi.spec Sun Oct 21 15:27:49 2007 +0000
+++ b/SFElibfribidi.spec Mon Oct 22 10:21:19 2007 +0000
@@ -3,15 +3,19 @@
#
# includes module(s): libfribidi
#
+# Copyright (c) 2007 Sun Microsystems, Inc.
+# This file and all modifications and additions to the pristine
+# package are under the same license as the package itself.
+#
+
%include Solaris.inc
-%define src_name fribidi
-%define src_url http://ftp.debian.org/debian/pool/main/f/fribidi
+%use fribidi = fribidi.spec
Name: SFElibfribidi
-Summary: Unicode Bidirectional Algorithm (bidi)
-Version: 0.10.7
-Source: %{src_url}/%{src_name}_%{version}.orig.tar.gz
+Summary: %fribidi.summary
+Version: 0.10.9
+Source: http://fribidi.org/download/fribidi-%{version}.tar.gz
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%include default-depend.inc
@@ -22,32 +26,19 @@
%include default-depend.inc
%prep
-%setup -q -n %{src_name}-%{version}
+rm -rf %name-%version
+mkdir -p %name-%version
+%fribidi.prep -d %name-%version
%build
-CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
-if test "x$CPUS" = "x" -o $CPUS = 0; then
- CPUS=1
-fi
-
-
+export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
export CFLAGS="%optflags"
-export LDFLAGS="%_ldflags"
-./configure --prefix=%{_prefix} \
- --bindir=%{_bindir} \
- --mandir=%{_mandir} \
- --libdir=%{_libdir} \
- --datadir=%{_datadir} \
- --libexecdir=%{_libexecdir} \
- --sysconfdir=%{_sysconfdir} \
- --enable-shared \
- --disable-static
-make -j$CPUS
+export RPM_OPT_FLAGS="$CFLAGS"
+%fribidi.build -d %name-%version
%install
rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT%{_libdir}/*.*a
+%fribidi.install -d %name-%version
%clean
rm -rf $RPM_BUILD_ROOT
@@ -66,5 +57,7 @@
%{_libdir}/pkgconfig/*
%changelog
+* Mon Oct 22 2007 - [email protected]
+- Spilit into fribidi.spec
* Tue Jun 5 2007 - [email protected]
- Initial version
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/base-specs/abiword.spec Mon Oct 22 10:21:19 2007 +0000
@@ -0,0 +1,124 @@
+# spec file for package abiword
+#
+# Copyright (c) 2007 Sun Microsystems, Inc.
+# This file and all modifications and additions to the pristine
+# package are under the same license as the package itself.
+#
+
+Name: abiword
+Version: 2.5.2
+Release: 1
+Summary: Lean and fast full-featured word processor
+Copyright: GPL
+URL: http://www.abisource.com/
+Source: http://www.abisource.com/downloads/%{name}/%{version}/source/%{name}-%{version}.tar.gz
+Patch1: %{name}-01-const-cast.diff
+Patch2: %{name}-02-reinterpret-cast.diff
+Patch3: %{name}-03-namespace-std.diff
+Patch4: %{name}-04-suncc-map.diff
+Patch5: %{name}-05-ut-xml-define.diff
+Patch6: %{name}-06-define-func.diff
+Patch7: %{name}-07-unistd.diff
+Patch8: %{name}-08-package-str.diff
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires: GConf-devel
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: expat-devel
+BuildRequires: freetype2-devel
+BuildRequires: gcc-c++
+BuildRequires: gnome-vfs-devel
+BuildRequires: gnome-print-devel
+BuildRequires: libMagick-devel
+BuildRequires: libbzip2-devel
+BuildRequires: libgal-devel
+BuildRequires: libglade-devel
+BuildRequires: libtool-devel
+BuildRequires: libpspell-devel
+BuildRequires: libwmf-devel >= 0.2.1
+BuildRequires: libxml2-devel
+BuildRequires: texinfo
+
+%description
+AbiWord is a cross-platform, Open Source Word Processor developed
+by the people at AbiSource, Inc. and by developers from around the world.
+(http://www.abisource.com)
+It is a lean and fast full-featured word processor. It works on Microsoft
+Windows and most Unix Systems. Features include:
+
+ * Basic character formatting (bold, underline, italics, etc.)
+ * Paragraph alignment
+ * Spell-check
+ * Import of Word97 and RTF documents
+ * Export to RTF, Text, HTML, and LaTeX formats
+ * Interactive rulers and tabs
+ * Styles
+ * Unlimited undo/redo
+ * Multiple column control
+ * Widow/orphan control
+ * Find/Replace
+ * Images
+
+%prep
+%setup -q
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+
+%build
+%ifos linux
+if [ -x /usr/bin/getconf ]; then
+ CPUS=`getconf _NPROCESSORS_ONLN`
+fi
+%else
+ CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
+%endif
+if test "x$CPUS" = "x" -o $CPUS = 0; then
+ CPUS=1
+fi
+
+./configure --prefix=%{_prefix} \
+ --libdir=%{_libdir} \
+ --bindir=%{_bindir} \
+ --includedir=%{_includedir} \
+ --sysconfdir=%{_sysconfdir} \
+ --datadir=%{_datadir} \
+ --mandir=%{_mandir} \
+
+make -j $CPUS
+
+%install
+rm -rf ${RPM_BUILD_ROOT}
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
+make -i install DESTDIR=$RPM_BUILD_ROOT
+unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';'
+
+%clean
+rm -rf ${RPM_BUILD_ROOT}
+
+%files
+%defattr(-,root,root)
+%doc abi/user/wp/readme.txt abi/BUILD abi/BUILD.TXT abi/BiDiReadme.txt abi/COPYING abi/COPYRIGHT.TXT abi/CREDITS.TXT abi/README.TXT abi/TODO.TXT abi/UnixFonts.txt abi/UnixLocales.txt abi/VERSION.TXT abi/abi2po.pl abi/po2abi.pl
+%doc abi/docs/*.abw abi/docs/*.txt abi/docs/*.html abi/docs/status/*.xsl abi/docs/status/*.xml
+%{_bindir}/*
+%dir %{_datadir}/AbiSuite
+%{_datadir}/AbiSuite/AbiWord
+%{_datadir}/AbiSuite/README
+%{_datadir}/AbiSuite/clipart
+%dir %{_datadir}/AbiSuite/dictionary
+%{_datadir}/AbiSuite/dictionary
+%{_datadir}/AbiSuite/fonts
+%{_datadir}/AbiSuite/icons
+%{_datadir}/AbiSuite/templates
+%defattr(-, root, root)
+/usr/X11R6/bin/abiword
+
+%changelog
+* Wed Sep 26 2007 - [email protected]
+- Initial spec
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/base-specs/fribidi.spec Mon Oct 22 10:21:19 2007 +0000
@@ -0,0 +1,122 @@
+# spec file for package fribidi
+#
+# Copyright (c) 2007 Sun Microsystems, Inc.
+# This file and all modifications and additions to the pristine
+# package are under the same license as the package itself.
+#
+
+Name: fribidi
+Version: 0.10.9
+Release: 1
+Summary: Library implementing the Unicode Bidirectional Algorithm
+Copyright: LGPL
+URL: http://fribidi.org/
+Source: http://fribidi.org/download/%{name}-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+
+%description
+A library to handle bidirectional scripts (eg. hebrew, arabic), so that
+the display is done in the proper way; while the text data itself is
+always written in logical order.
+
+%package -n %{name}
+Summary: Library implementing the Unicode Bidirectional Algorithm
+Group: System/Libraries
+Provides: lib%{name}
+Provides: lib%{name}-devel
+%description -n %{name}
+A library to handle bidirectional scripts (eg. hebrew, arabic), so that
+the display is done in the proper way; while the text data itself is
+always written in logical order.
+
+Install %{name} if you want to run or develop programs that use %{name}.
+
+
+%package -n lib%{name}
+Summary: Library implementing the Unicode Bidirectional Algorithm
+Group: System/Libraries
+Conflicts: %{name}
+%description -n lib%{name}
+The lib%{name} package includes the shared libraries for the %{name} package.
+
+nstall lib%{name} if you want to run programs which use %{name}.
+
+
+%package -n lib%{name}-devel
+Summary: Library implementing the Unicode Bidirectional Algorithm
+Group: Development/C
+Requires: lib%{name} = %{ver}
+Conflicts: %{name}
+%description -n lib%{name}-devel
+The lib%{name}-devel package includes the static libraries and header files
+for the %{name} package.
+
+Install lib%{name}-devel if you want to develop programs which will use
+%{name}.
+
+%prep
+%setup -q
+
+%build
+%ifos linux
+if [ -x /usr/bin/getconf ]; then
+ CPUS=`getconf _NPROCESSORS_ONLN`
+fi
+%else
+ CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
+%endif
+if test "x$CPUS" = "x" -o $CPUS = 0; then
+ CPUS=1
+fi
+
+./configure --prefix=%{_prefix} \
+ --libdir=%{_libdir} \
+ --bindir=%{_bindir} \
+ --includedir=%{_includedir} \
+ --sysconfdir=%{_sysconfdir} \
+ --datadir=%{_datadir} \
+ --mandir=%{_mandir}
+
+make -j $CPUS
+
+%install
+rm -rf ${RPM_BUILD_ROOT}
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
+make -i install DESTDIR=$RPM_BUILD_ROOT
+unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';'
+
+%clean
+rm -rf ${RPM_BUILD_ROOT}
+
+%files
+%defattr(-,root,root)
+%doc README AUTHORS COPYING ChangeLog TODO THANKS NEWS
+%{_bindir}/%{name}
+%{_bindir}/%{name}-config
+%{_libdir}/*.so.*
+%{_libdir}/pkgconfig/%{name}.pc
+%{_libdir}/*.a
+%{_libdir}/*.la
+%{_libdir}/*.so
+%{_includedir}/*
+
+%files -n lib%{name}
+%defattr(-, root, root)
+%doc README AUTHORS COPYING ChangeLog TODO THANKS NEWS
+%{_bindir}/%{name}
+%{_bindir}/%{name}-config
+%{_libdir}/*.so.*
+
+%files -n lib%{name}-devel
+%defattr(-, root, root)
+%{_libdir}/*.a
+%{_libdir}/*.la
+%{_libdir}/*.so
+%{_includedir}/*
+%{_libdir}/pkgconfig/%{name}.pc
+
+%changelog
+* Fri Oct 19 2007 - [email protected]
+- Initial spec
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/abiword-01-const-cast.diff Mon Oct 22 10:21:19 2007 +0000
@@ -0,0 +1,15 @@
+Index: abiword-trunk/src/text/ptbl/xp/pt_PT_InsertObject.cpp
+===================================================================
+--- abiword-trunk/src/text/ptbl/xp/pt_PT_InsertObject.cpp (revision 22159)
++++ abiword-trunk/src/text/ptbl/xp/pt_PT_InsertObject.cpp (working copy)
+@@ -279,8 +279,8 @@
+ }
+ if(sProps.size() > 0)
+ {
+- Atts.addItem(static_cast<gchar *>("props"));
+- Atts.addItem(static_cast<gchar *>(const_cast<char *>(sProps.utf8_str())));
++ Atts.addItem(const_cast<gchar *>("props"));
++ Atts.addItem(static_cast<gchar *>(const_cast<char *>(sProps.utf8_str())));
+ }
+ PT_AttrPropIndex indexAP;
+ if (!m_varset.storeAP(&Atts,&indexAP))
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/abiword-02-reinterpret-cast.diff Mon Oct 22 10:21:19 2007 +0000
@@ -0,0 +1,52 @@
+Index: abiword-trunk/src/af/xap/unix/xap_UnixFrameImpl.cpp
+===================================================================
+--- abiword-trunk/src/af/xap/unix/xap_UnixFrameImpl.cpp (revision 22159)
++++ abiword-trunk/src/af/xap/unix/xap_UnixFrameImpl.cpp (working copy)
+@@ -933,7 +933,7 @@
+
+ if(!pUnixFrameImpl->m_bDoZoomUpdate && (pUnixFrameImpl->m_iZoomUpdateID == 0))
+ {
+- pUnixFrameImpl->m_iZoomUpdateID = g_idle_add(static_cast<GSourceFunc>(do_ZoomUpdate), static_cast<gpointer>(pUnixFrameImpl));
++ pUnixFrameImpl->m_iZoomUpdateID = g_idle_add(reinterpret_cast<GSourceFunc>(do_ZoomUpdate), static_cast<gpointer>(pUnixFrameImpl));
+ }
+ }
+ return 1;
+Index: abiword-trunk/src/af/util/xp/ut_png.cpp
+===================================================================
+--- abiword-trunk/src/af/util/xp/ut_png.cpp (revision 22159)
++++ abiword-trunk/src/af/util/xp/ut_png.cpp (working copy)
+@@ -84,7 +84,7 @@
+ myBB.pBB = pBB;
+ myBB.iCurPos = 0;
+
+- png_set_read_fn(png_ptr, static_cast<void *>(&myBB), static_cast<png_rw_ptr>(_png_read));
++ png_set_read_fn(png_ptr, static_cast<void *>(&myBB), reinterpret_cast<png_rw_ptr>(_png_read));
+
+ /* The call to png_read_info() gives us all of the information from the
+ * PNG file before the first IDAT (image data chunk). REQUIRED
+Index: abiword-trunk/src/wp/ap/unix/abiwidget.cpp
+===================================================================
+--- abiword-trunk/src/wp/ap/unix/abiwidget.cpp (revision 22159)
++++ abiword-trunk/src/wp/ap/unix/abiwidget.cpp (working copy)
+@@ -1588,7 +1588,7 @@
+ //
+ // Can't load until this event has finished propagating
+ //
+- g_idle_add(static_cast<GSourceFunc>(s_abi_widget_load_file),static_cast<gpointer>(abi));
++ g_idle_add(reinterpret_cast<GSourceFunc>(s_abi_widget_load_file),static_cast<gpointer>(abi));
+ }
+ }
+
+Index: abiword-trunk/src/wp/impexp/unix/ie_impGraphic_GdkPixbuf.cpp
+===================================================================
+--- abiword-trunk/src/wp/impexp/unix/ie_impGraphic_GdkPixbuf.cpp (revision 22159)
++++ abiword-trunk/src/wp/impexp/unix/ie_impGraphic_GdkPixbuf.cpp (working copy)
+@@ -454,7 +454,7 @@
+ m_pPngBB = new UT_ByteBuf; /* Byte Buffer for Converted Data */
+
+ /* Setting up the Data Writing Function */
+- png_set_write_fn(m_pPNG, static_cast<void *>(m_pPngBB), static_cast<png_rw_ptr>(_write_png), NULL);
++ png_set_write_fn(m_pPNG, static_cast<void *>(m_pPngBB), reinterpret_cast<png_rw_ptr>(_write_png), NULL);
+
+ return UT_OK;
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/abiword-03-namespace-std.diff Mon Oct 22 10:21:19 2007 +0000
@@ -0,0 +1,13 @@
+Index: abiword-trunk/src/af/xap/xp/xap_Prefs.cpp
+===================================================================
+--- abiword-trunk/src/af/xap/xp/xap_Prefs.cpp (revision 22159)
++++ abiword-trunk/src/af/xap/xp/xap_Prefs.cpp (working copy)
+@@ -1693,7 +1693,7 @@
+ return false;
+
+ std::vector<UT_UTF8String>::const_iterator i =
+- find(m_vecFonts.begin(), m_vecFonts.end(), name);
++ std::find(m_vecFonts.begin(), m_vecFonts.end(), name);
+
+ return i != m_vecFonts.end();
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/abiword-04-suncc-map.diff Mon Oct 22 10:21:19 2007 +0000
@@ -0,0 +1,16 @@
+Index: abiword-trunk/src/af/xap/xp/xap_DialogFactory.cpp
+===================================================================
+--- abiword-trunk/src/af/xap/xp/xap_DialogFactory.cpp (revision 22159)
++++ abiword-trunk/src/af/xap/xp/xap_DialogFactory.cpp (working copy)
+@@ -28,7 +28,11 @@
+ #include "xap_Dialog_Id.h"
+
+ // save some typing
++#if !defined(__SUNPRO_CC)
+ typedef std::multimap<XAP_Dialog_Id, const XAP_NotebookDialog::Page*> NotebookPages;
++#else
++typedef std::map<XAP_Dialog_Id, const XAP_NotebookDialog::Page*> NotebookPages;
++#endif
+ typedef NotebookPages::iterator NotebookPagesIter;
+
+ static NotebookPages s_mapNotebookPages;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/abiword-05-ut-xml-define.diff Mon Oct 22 10:21:19 2007 +0000
@@ -0,0 +1,17 @@
+Index: abiword-trunk/src/af/util/xp/ut_xml.h
+===================================================================
+--- abiword-trunk/src/af/util/xp/ut_xml.h (revision 22159)
++++ abiword-trunk/src/af/util/xp/ut_xml.h (working copy)
+@@ -186,10 +186,10 @@
+ *
+ * or vice versa... ?
+ */
+- void startElement (const gchar * name, const gchar ** atts);
++ void startElement (const char * name, const char ** atts);
+ void endElement (const gchar * name);
+ void charData (const gchar * buffer, int length);
+- void processingInstruction (const gchar * target, const gchar * data);
++ void processingInstruction (const char * target, const char * data);
+ void comment (const gchar * data);
+ void cdataSection (bool start);
+ void defaultData (const gchar * buffer, int length);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/abiword-06-define-func.diff Mon Oct 22 10:21:19 2007 +0000
@@ -0,0 +1,13 @@
+Index: abiword-trunk/src/wp/ap/xp/ap_Toolbar_Layouts.cpp
+===================================================================
+--- abiword-trunk/src/wp/ap/xp/ap_Toolbar_Layouts.cpp (revision 22159)
++++ abiword-trunk/src/wp/ap/xp/ap_Toolbar_Layouts.cpp (working copy)
+@@ -342,7 +342,7 @@
+ return pLayout;
+ }
+ else {
+- fprintf (stderr, "%s:%s: Layout `%s' not found\n", __FILE__, __FUNCTION__, szName);
++ fprintf (stderr, "%s:%s: Layout `%s' not found\n", __FILE__, G_GNUC_PRETTY_FUNCTION, szName);
+ }
+ return NULL;
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/abiword-07-unistd.diff Mon Oct 22 10:21:19 2007 +0000
@@ -0,0 +1,12 @@
+Index: abiword-trunk/src/wp/ap/xp/ap_EditMethods.cpp
+===================================================================
+--- abiword-trunk/src/wp/ap/xp/ap_EditMethods.cpp (revision 22159)
++++ abiword-trunk/src/wp/ap/xp/ap_EditMethods.cpp (working copy)
+@@ -33,6 +33,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <time.h>
++#include <unistd.h>
+
+ #include "xap_Features.h"
+ #include "ap_Features.h"