- up to 2016-January version

diff --git a/arabica-makefile.patch b/arabica-makefile.patch
deleted file mode 100644 (file)
index 4d5bbfa..0000000
--- a/arabica-makefile.patch
+++ /dev/null
@@ -1,75 +0,0 @@
---- arabica-2004-february/examples/SAX/Makefile~       2003-09-10 15:34:07.000000000 +0200
-+++ arabica-2004-february/examples/SAX/Makefile        2005-06-12 14:02:37.840087048 +0200
-@@ -7,7 +7,7 @@
- LIBS_DIRS += -L../../bin 
- 
- STATIC_LIBS +=
--DYNAMIC_LIBS += -lArabica
-+MORE_LIBS = $(DYNAMIC_LIBS) -lArabica
- 
- ######################################
- # SOURCE FILES
-@@ -28,15 +28,15 @@
- all : pyx simple_handler writer
- 
- pyx$ : $(PYX_OBJS)
--      $(LD) $(LDFLAGS) -o $@ $(PYX_OBJS) $(LIBS_DIRS) $(STATIC_LIBS) $(DYNAMIC_LIBS)
-+      $(LD) $(LDFLAGS) -o $@ $(PYX_OBJS) $(LIBS_DIRS) $(STATIC_LIBS) $(MORE_LIBS)
-       $(COPY) pyx$(EXESUFFIX) ../../bin
- 
- simple_handler : $(SIMPLE_OBJS)
--      $(LD) $(LDFLAGS) -o $@ $(SIMPLE_OBJS) $(LIBS_DIRS) $(STATIC_LIBS) $(DYNAMIC_LIBS)
-+      $(LD) $(LDFLAGS) -o $@ $(SIMPLE_OBJS) $(LIBS_DIRS) $(STATIC_LIBS) $(MORE_LIBS)
-       $(COPY) simple_handler$(EXESUFFIX) ../../bin
- 
- writer : $(WRITER_OBJS)
--      $(LD) $(LDFLAGS) -o $@ $(WRITER_OBJS) $(LIBS_DIRS) $(STATIC_LIBS) $(DYNAMIC_LIBS)
-+      $(LD) $(LDFLAGS) -o $@ $(WRITER_OBJS) $(LIBS_DIRS) $(STATIC_LIBS) $(MORE_LIBS)
-       $(COPY) writer$(EXESUFFIX) ../../bin
- 
- ######################
---- arabica-2004-february/examples/SAX2DOM/Makefile~   2003-09-10 15:34:07.000000000 +0200
-+++ arabica-2004-february/examples/SAX2DOM/Makefile    2005-06-12 14:09:43.491378216 +0200
-@@ -7,7 +7,7 @@
- LIBS_DIRS += -L../../bin 
- 
- STATIC_LIBS +=
--DYNAMIC_LIBS += -lArabica
-+MORE_LIBS = $(DYNAMIC_LIBS) -lArabica
- 
- ######################################
- # SOURCE FILES
-@@ -32,11 +32,11 @@
- all : sax2dom_test domwriter
- 
- sax2dom_test : $(SAXDOM_OBJS) $(CPPUNITFW_OBJS) $(CPPUNITUI_OBJS)
--      $(LD) $(LDFLAGS) -o $@ $(SAXDOM_OBJS) $(CPPUNITFW_OBJS) $(CPPUNITUI_OBJS) $(LIBS_DIRS) $(STATIC_LIBS) $(DYNAMIC_LIBS)
-+      $(LD) $(LDFLAGS) -o $@ $(SAXDOM_OBJS) $(CPPUNITFW_OBJS) $(CPPUNITUI_OBJS) $(LIBS_DIRS) $(STATIC_LIBS) $(MORE_LIBS)
-       $(COPY) sax2dom_test$(EXESUFFIX) ../../bin
- 
- domwriter : $(DOMWRITER_OBJS)
--      $(LD) $(LDFLAGS)  -o $@ $(DOMWRITER_OBJS) $(LIBS_DIRS) $(STATIC_LIBS) $(DYNAMIC_LIBS)
-+      $(LD) $(LDFLAGS)  -o $@ $(DOMWRITER_OBJS) $(LIBS_DIRS) $(STATIC_LIBS) $(MORE_LIBS)
-       $(COPY) domwriter$(EXESUFFIX) ../../bin
- 
- ######################
---- arabica-2004-february/examples/Utils/Makefile~     2005-06-12 15:04:08.797976160 +0200
-+++ arabica-2004-february/examples/Utils/Makefile      2005-06-12 15:03:59.181438096 +0200
-@@ -7,7 +7,7 @@
- LIBS_DIRS += -L../../bin 
- 
- STATIC_LIBS +=
--DYNAMIC_LIBS += -lArabica
-+MORE_LIBS = $(DYNAMIC_LIBS) -lArabica
- 
- ######################################
- # SOURCE FILES
-@@ -20,7 +20,7 @@
- all : transcode
- 
- transcode : $(TRANSCODE_OBJS)
--      $(LD) $(LDFLAGS) -o $@ $(TRANSCODE_OBJS) $(LIBS_DIRS) $(STATIC_LIBS) $(DYNAMIC_LIBS)
-+      $(LD) $(LDFLAGS) -o $@ $(TRANSCODE_OBJS) $(LIBS_DIRS) $(STATIC_LIBS) $(MORE_LIBS)
-       $(COPY) transcode$(EXESUFFIX) ../../bin
- 
- 

diff --git a/arabica.spec b/arabica.spec
index 2832117d16aa84b0a6a7f406aae0806a3b81f36b..028a799b8ba3ee4931505bf7d635d1f139f0f9b1 100644 (file)
--- a/arabica.spec
+++ b/arabica.spec
@@ -1,20 +1,18 @@
 #
 # TODO:
 # - unify Arabica <-> arabica
-# - is -fPIC correct?
 # - more parsers
 #
 Summary:       Arabica - an XML parser toolkit written in C++
 Summary(pl.UTF-8):     Arabica - narzędzia do parsowania XML napisane w C++
 Name:          arabica
-Version:       2004_february
+Version:       2016_January
 %define        _ver    %(echo %{version} | tr _ -)
-Release:       0.1
+Release:       1
 License:       BSD-like
 Group:         Development/Libraries
-Source0:       http://dl.sourceforge.net/arabica/%{name}-%{_ver}.tar.gz
-# Source0-md5: 64a0ccdfd9a9e10a5391237969033c3c
-Patch0:                %{name}-makefile.patch
+Source0:       https://github.com/jezhiggins/arabica/archive/%{_ver}.tar.gz
+# Source0-md5: 2ab97777049ac703e7ff03710ea9c1a2
 URL:           http://www.jezuk.co.uk/cgi-bin/view/arabica
 BuildRequires: libstdc++-devel
 BuildRequires: libxml2-devel
@@ -56,37 +54,56 @@ Header files for Arabica.
 %description devel -l pl.UTF-8
 Pliki nagłówkowe Arabica.
 
+%package static
+Summary:       Static Arabica library
+Summary(pl.UTF-8):     Statyczna biblioteka Arabica
+Group:         Development/Libraries
+Requires:      %{name}-devel = %{version}-%{release}
+
+%description static
+Static Arabica library.
+
+%description static -l pl.UTF-8
+Statyczna biblioteka Arabica.
+
 %prep
 %setup -q -n %{name}-%{_ver}
-%patch0 -p1
 
 %build
-%{__make} \
-       CXX="%{__cxx}" \
-       CPP="%{__cpp}" \
-       LD="%{__cxx}" \
-       CXXFLAGS="%{rpmcxxflags} -fPIC" \
-       INCS_DIRS="-I%{_builddir}/%{buildsubdir} `xml2-config --cflags`" \
-       DYNAMIC_LIBS="-lstdc++ `xml2-config --libs`" \
-       LINK_SHARED="-shared -fPIC"
-#      USE_PARSER="-DUSE_EXPAT -DUSE_LIBXML2 -DUSE_XERCES"
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+%configure
+
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_libdir},%{_includedir}/arabica}
 
-install bin/libArabica.so $RPM_BUILD_ROOT%{_libdir}
-find DOM SAX XML Utils -name \*.h -exec \
-       install -D '{}' $RPM_BUILD_ROOT%{_includedir}/arabica/'{}' \;
+%{__make} install \
+     DESTDIR=$RPM_BUILD_ROOT
+
+%{__mv} $RPM_BUILD_ROOT%{_bindir}/mangle $RPM_BUILD_ROOT%{_bindir}/arabica-mangle
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog todo.txt
-%attr(755,root,root) %{_libdir}/*.so
+%doc README NEWS AUTHORS ChangeLog
+%attr(755,root,root) %{_bindir}/arabica-mangle
+%attr(755,root,root) %{_libdir}/libarabica.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libarabica.so.0
 
 %files devel
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libarabica.so
+%{_libdir}/libarabica.la
 %{_includedir}/arabica
+%{_pkgconfigdir}/arabica.pc
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libarabica.a