- unified configure options order

[packages/db4.6.git] / db4.6.spec

diff --git a/db4.6.spec b/db4.6.spec
index 55a2f8e3364338371c5646812bb74fc96e2f5dc9..32b0cccaabd503f86093f2a8ebdb334822834e3a 100644 (file)
--- a/db4.6.spec
+++ b/db4.6.spec
@@ -67,6 +67,7 @@ Group:                Development/Libraries
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 %if %{with default_db}
 Provides:      db-devel = %{version}-%{release}
+Obsoletes:     db-devel
 Obsoletes:     db3-devel
 Obsoletes:     db4-devel
 %endif
@@ -100,6 +101,7 @@ Group:              Development/Libraries
 Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
 %if %{with default_db}
 Provides:      db-static = %{version}-%{release}
+Obsoletes:     db-static
 Obsoletes:     db3-static
 Obsoletes:     db4-static
 %endif
@@ -149,6 +151,7 @@ Requires:   %{name}-cxx = %{epoch}:%{version}-%{release}
 Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
 %if %{with default_db}
 Provides:      db-cxx-devel = %{version}-%{release}
+Obsoletes:     db-cxx-devel
 %endif
 Conflicts:     db-devel < 4.1.25-3
 
@@ -165,6 +168,7 @@ Group:              Development/Libraries
 Requires:      %{name}-cxx-devel = %{epoch}:%{version}-%{release}
 %if %{with default_db}
 Provides:      db-cxx-static = %{version}-%{release}
+Obsoletes:     db-cxx-static
 %endif
 Conflicts:     db-static < 4.2.50-1
 
@@ -181,6 +185,7 @@ Group:              Libraries
 Requires:      jpackage-utils
 %if %{with default_db}
 Provides:      db-java = %{version}-%{release}
+Obsoletes:     db-java
 %endif
 
 %description java
@@ -196,6 +201,7 @@ Group:              Development/Languages/Java
 Requires:      %{name}-java = %{epoch}:%{version}-%{release}
 %if %{with default_db}
 Provides:      db-java-devel = %{version}-%{release}
+Obsoletes:     db-java-devel
 %endif
 Conflicts:     db-devel < 4.1.25-3
 
@@ -228,6 +234,7 @@ Group:              Development/Languages/Tcl
 Requires:      %{name}-tcl = %{epoch}:%{version}-%{release}
 %if %{with default_db}
 Provides:      db-tcl-devel = %{version}-%{release}
+Obsoletes:     db-tcl-devel
 %endif
 Conflicts:     db-devel < 4.1.25-3
 
@@ -303,12 +310,12 @@ LDFLAGS="%{rpmcflags} %{rpmldflags}"
 export CC CXX CFLAGS CXXFLAGS LDFLAGS
 
 ../dist/%configure \
-       --enable-compat185 \
        --disable-shared \
        --enable-static \
-       --enable-rpc \
+       --enable-compat185 \
+       --enable-cxx \
        --%{?with_pmutex:en}%{!?with_pmutex:dis}able-posixmutexes \
-       --enable-cxx
+       --enable-rpc
 
 # (temporarily?) disabled because of compilation errors:
 #      --enable-dump185 \
@@ -322,15 +329,14 @@ cd build_unix
 ../dist/%configure \
        --prefix=%{_prefix} \
        --libdir=%{_libdir} \
+       --enable-shared \
+       --disable-static \
        --enable-compat185 \
-       --enable-rpc \
-       --%{?with_pmutex:en}%{!?with_pmutex:dis}able-posixmutexes \
        --enable-cxx \
-       %{?with_tcl:--enable-tcl} \
-       %{?with_tcl:--with-tcl=/usr/lib} \
+       --%{?with_pmutex:en}%{!?with_pmutex:dis}able-posixmutexes \
+       --enable-rpc \
        %{?with_java:--enable-java} \
-       --disable-static \
-       --enable-shared
+       %{?with_tcl:--enable-tcl --with-tcl=/usr/lib}
 
 %{__make} library_build \
        TCFLAGS='-I$(builddir) -I%{_includedir}' \