Some clean up, version components defined separately.

6 files changed, 99 insertions, 79 deletions

diff --git a/ChangeLog b/ChangeLog
index 3da931d..0c687f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-01-18  Behdad Esfahbod <behdad@bamdad.org>
+	* configure.in, fribidi.spec.in: Clean up, different version components
+	defined, rpm names changed from fribidi to fribidi{majorversion}.
+
 2002-01-14  Behdad Esfahbod <behdad@bamdad.org>
 	* fribidi.c: Rewrote run_length_encode_types() main loop.
 
diff --git a/TODO b/TODO
index 0d5cfc8..b5c03fc 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,8 @@
 Implementation issues:
 
+* FriBidiEnv type should be defined that is to hold all global variables
+  and should be passed as environment to all fribidi functions.
+
 * packtab.c should produce outputs with much fewer symbols, with the idea
   of putting different tables in one, and store the offsets instead of
   pointers.
diff --git a/acconfig.h b/acconfig.h
index 3d3316e..23b1c5b 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -16,3 +16,5 @@
 #undef HAS_FRIBIDI_TAB_CHAR_TYPE_7_I
 #undef HAS_FRIBIDI_TAB_CHAR_TYPE_8_I
 #undef HAS_FRIBIDI_TAB_CHAR_TYPE_9_I
+/* We should #undef this symbol, to make autoheader shut up */
+#undef HAS_FRIBIDI_TAB_CHAR_TYPE__I
diff --git a/configure.in b/configure.in
index 261f413..4bd0be9 100644
--- a/configure.in
+++ b/configure.in
@@ -1,13 +1,44 @@
+# Init autoconf (and check for presence of fribidi.c)
 AC_INIT(fribidi.c)
 
-PACKAGE=fribidi
-VERSION=0.10.1pre
-INTERFACE_VERSION=2
-dnl Release number for RPM spec file
-SPECRELEASE=1
+# Define different version variables.
+#
+# Making releases:
+#   FRIBIDI_MICRO_VERSION++;
+#   FRIBIDI_INTERFACE_AGE++;
+#   FRIBIDI_BINARY_AGE++;
+#   FRIBIDI_SPEC_RELEASE = 0;
+#
+# If any functions have been added:
+#   FRIBIDI_INTERFACE_AGE = 0;
+#   FRIBIDI_INTERFACE_VERSION++;
+#
+# If backwards compatibility has been broken:
+#   FRIBIDI_BINARY_AGE = FRIBIDI_INTERFACE_AGE = 0;
+#
+# Building RPMs:
+#   FRIBIDI_SPEC_RELEASE++;
+#
+FRIBIDI_MAJOR_VERSION=0
+FRIBIDI_MINOR_VERSION=10
+FRIBIDI_MICRO_VERSION=1pre
+FRIBIDI_INTERFACE_VERSION=2
+FRIBIDI_INTERFACE_AGE=1
+FRIBIDI_BINARY_AGE=1
+FRIBIDI_SPEC_RELEASE=0
+FRIBIDI_VERSION=$FRIBIDI_MAJOR_VERSION.$FRIBIDI_MINOR_VERSION.$FRIBIDI_MICRO_VERSION
+
+AC_SUBST(FRIBIDI_MAJOR_VERSION)
+AC_SUBST(FRIBIDI_MINOR_VERSION)
+AC_SUBST(FRIBIDI_MICRO_VERSION)
+AC_SUBST(FRIBIDI_VERSION)
+AC_SUBST(FRIBIDI_INTERFACE_VERSION)
+AC_SUBST(FRIBIDI_INTERFACE_AGE)
+AC_SUBST(FRIBIDI_BINARY_AGE)
+AC_SUBST(FRIBIDI_SPEC_RELEASE)
 
-AC_SUBST(INTERFACE_VERSION)
-AC_SUBST(SPECRELEASE)
+PACKAGE=fribidi
+VERSION=$FRIBIDI_VERSION
 
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
@@ -59,45 +90,12 @@ fi
 
 dnl check for fribidi_tab_char_type_*.i files
 
-if test -f "${srcdir}/fribidi_tab_char_type_2.i" ||
-   test -f         "./fribidi_tab_char_type_2.i"; then
-  AC_DEFINE(HAS_FRIBIDI_TAB_CHAR_TYPE_2_I)
-fi
-
-if test -f "${srcdir}/fribidi_tab_char_type_3.i" ||
-   test -f         "./fribidi_tab_char_type_3.i"; then
-  AC_DEFINE(HAS_FRIBIDI_TAB_CHAR_TYPE_3_I)
-fi
-
-if test -f "${srcdir}/fribidi_tab_char_type_4.i" ||
-   test -f         "./fribidi_tab_char_type_4.i"; then
-  AC_DEFINE(HAS_FRIBIDI_TAB_CHAR_TYPE_4_I)
-fi
-
-if test -f "${srcdir}/fribidi_tab_char_type_5.i" ||
-   test -f         "./fribidi_tab_char_type_5.i"; then
-  AC_DEFINE(HAS_FRIBIDI_TAB_CHAR_TYPE_5_I)
-fi
-
-if test -f "${srcdir}/fribidi_tab_char_type_6.i" ||
-   test -f         "./fribidi_tab_char_type_6.i"; then
-  AC_DEFINE(HAS_FRIBIDI_TAB_CHAR_TYPE_6_I)
-fi
-
-if test -f "${srcdir}/fribidi_tab_char_type_7.i" ||
-   test -f         "./fribidi_tab_char_type_7.i"; then
-  AC_DEFINE(HAS_FRIBIDI_TAB_CHAR_TYPE_7_I)
-fi
-
-if test -f "${srcdir}/fribidi_tab_char_type_8.i" ||
-   test -f         "./fribidi_tab_char_type_8.i"; then
-  AC_DEFINE(HAS_FRIBIDI_TAB_CHAR_TYPE_8_I)
-fi
-
-if test -f "${srcdir}/fribidi_tab_char_type_9.i" ||
-   test -f         "./fribidi_tab_char_type_9.i"; then
-  AC_DEFINE(HAS_FRIBIDI_TAB_CHAR_TYPE_9_I)
-fi
+for n in 2 3 4 5 6 7 8 9; do
+  if test -f "${srcdir}/fribidi_tab_char_type_$n.i" ||
+     test -f         "./fribidi_tab_char_type_$n.i"; then
+    AC_DEFINE_UNQUOTED(HAS_FRIBIDI_TAB_CHAR_TYPE_${n}_I)
+  fi
+done
 
 echo "creating fribidi_tab_char_type_stamp"
 echo "time-stamp" > fribidi_tab_char_type_stamp
diff --git a/fribidi.spec.in b/fribidi.spec.in
index f15835d..86c54be 100644
--- a/fribidi.spec.in
+++ b/fribidi.spec.in
@@ -2,17 +2,21 @@
 #
 #	Everything:
 #		(this is equivalent to two others together)
-#			fribidi-version-release-arch.rpm
+#			fribidiN-version-release-arch.rpm
 #	Runtime material: Shared library and command line tool
-#			libfribidi-version-release-arch.rpm
+#			libfribidiN-version-release-arch.rpm
 #	Development material: Static library and header files
 #		(requires libfribidi)
 #			libfribidi-devel-version-release-arch.rpm
+#	Where N is the major version number.
 
 %define name @PACKAGE@
-%define ver @VERSION@
-%define rel @SPECRELEASE@
-%define apiver @INTERFACE_VERSION@
+%define ver @FRIBIDI_VERSION@
+%define major @FRIBIDI_MAJOR_VERSION@
+%define minor @FRIBIDI_MINOR_VERSION@
+%define micro @FRIBIDI_MICRO_VERSION@
+%define apiver @FRIBIDI_INTERFACE_VERSION@
+%define rel @FRIBIDI_SPEC_RELEASE@
 %define prefix %{_prefix}
 
 Name: %{name}
@@ -20,42 +24,49 @@ Version: %{ver}
 Release: %{rel}
 Serial: %{apiver}
 Copyright: LGPL
-Source: http://telia.dl.sourceforge.net/fribidi/%{name}-%{ver}.tar.gz
+Source: http://prdownloads.sourceforge.net/fribidi/%{name}-%{ver}.tar.gz
 URL: http://fribidi.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}
-
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Group: System/Libraries
-Provides: lib%{name}
-Provides: lib%{name}-devel
 %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.
 
-Install %{name} if you want to run or develop programs that use %{name}.
+%package -n %{name}%{major}
+Summary: Library implementing the Unicode Bidirectional Algorithm
+Group: System/Libraries
+Provides: lib%{name}%{major}
+Provides: lib%{name}%{major}-devel
+%description -n %{name}%{major}
+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}%{major} if you want to run or develop programs that use %{name}.
 
 
-%package -n lib%{name}
+%package -n lib%{name}%{major}
 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.
+Conflicts: %{name}%{major}
+%description -n lib%{name}%{major}
+The lib%{name}%{major} package includes the shared libraries for the %{name}%{major} package.
 
-Install lib%{name} if you want to run programs which use %{name}.
+Install lib%{name}%{major} if you want to run programs which use %{name}.
 
 
-%package -n lib%{name}-devel
+%package -n lib%{name}%{major}-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.
+Requires: lib%{name}%{major} = %{ver}
+Conflicts: %{name}%{major}
+%description -n lib%{name}%{major}-devel
+The lib%{name}%{major}-devel package includes the static libraries and header files
+for the %{name}%{major} package.
 
-Install lib%{name}-devel if you want to develop programs which will use
+Install lib%{name}%{major}-devel if you want to develop programs which will use
 %{name}.
 
 
@@ -87,13 +98,13 @@ make DESTDIR="$RPM_BUILD_ROOT" install
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post -n %{name}%{major} -p /sbin/ldconfig
+%postun -n %{name}%{major} -p /sbin/ldconfig
 
-%post -n lib%{name} -p /sbin/ldconfig
-%postun -n lib%{name} -p /sbin/ldconfig
+%post -n lib%{name}%{major} -p /sbin/ldconfig
+%postun -n lib%{name}%{major} -p /sbin/ldconfig
 
-%files
+%files -n %{name}%{major}
 %defattr(-,root,root)
 %doc README AUTHORS COPYING ChangeLog TODO THANKS NEWS
 %{_bindir}/%{name}
@@ -105,7 +116,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 %{_includedir}/*
 
-%files -n lib%{name}
+%files -n lib%{name}%{major}
 %defattr(-, root, root)
 %doc README AUTHORS COPYING ChangeLog TODO THANKS NEWS
 %{_bindir}/%{name}
@@ -113,7 +124,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so.*
 %{_libdir}/pkgconfig/%{name}.pc
 
-%files -n lib%{name}-devel
+%files -n lib%{name}%{major}-devel
 %defattr(-, root, root)
 %{_libdir}/*.a
 %{_libdir}/*.la
diff --git a/fribidi_config.h.in b/fribidi_config.h.in
index 2f4dcca..f9db373 100644
--- a/fribidi_config.h.in
+++ b/fribidi_config.h.in
@@ -1,10 +1,12 @@
 
 #define FRIBIDI_PACKAGE "@PACKAGE@"
 
-#define FRIBIDI_VERSION "@VERSION@"
-
-#define FRIBIDI_INTERFACE_VERSION @INTERFACE_VERSION@
-#define FRIBIDI_INTERFACE_VERSION_STR "@INTERFACE_VERSION@"
+#define FRIBIDI_VERSION "@FRIBIDI_VERSION@"
+#define FRIBIDI_MAJOR_VERSION @FRIBIDI_MAJOR_VERSION@
+#define FRIBIDI_MINOR_VERSION @FRIBIDI_MINOR_VERSION@
+#define FRIBIDI_MICRO_VERSION_STR "@FRIBIDI_MICRO_VERSION@"
+#define FRIBIDI_INTERFACE_VERSION @FRIBIDI_INTERFACE_VERSION@
+#define FRIBIDI_INTERFACE_VERSION_STR "@FRIBIDI_INTERFACE_VERSION@"
 
 #if @FRIBIDI_NO_CHARSETS@
 #define FRIBIDI_NO_CHARSETS 1