Fix and polish new package: - replace tabs with spaces - add dependency gcc (because of C++) - fix typos "opensd" -> "opensp" - use --datadir=%{l_prefix}/share/sgml - use --disable-shared - use DESTDIR - depend on "sgml" and use its mkcatalog - do not keep out-commented things

opensp/opensp.spec

@@ -42,51 +42,55 @@ Source0:      http://download.sourceforge.net/openjade/OpenSP-%{version}.tar.gz
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
 BuildPreReq:  OpenPKG, openpkg >= 20021122, gcc
-PreReq:       OpenPKG, openpkg >= 20021122
+PreReq:       OpenPKG, openpkg >= 20021122, sgml
 AutoReq:      no
 AutoReqProv:  no
 
 %description
-	This package is a collection of SGML/XML tools called OpenSP. It is a fork from
-	James Clark's SP suite. These tools are used to parse, validate, and normalize
-	SGML and XML files.
+    This package is a collection of SGML/XML tools called OpenSP. It is a fork from
+    James Clark's SP suite. These tools are used to parse, validate, and normalize
+    SGML and XML files.
 
 %prep
     %setup -q -n OpenSP-%{version}
 
 %build
-    echo "ac_cv_func_setlocale=${ac_cv_func_setlocale='no'}" >config.cache
     CC="%{l_cc}" \
+    CXX="%{l_cxx}" \
     CFLAGS="%{l_cflags -O}" \
+    CXXFLAGS="%{l_cflags -O}" \
+    CPPFLAGS="%{l_cppflags}" \
     ./configure \
         --prefix=%{l_prefix} \
-        --datadir=%{l_prefix}/share/sgml/opensd \
+        --datadir=%{l_prefix}/share/sgml \
         --enable-default-catalog=%{l_prefix}/share/sgml/catalog \
-        --enable-default-search-path=%{l_prefix}/share/sgml 
+        --enable-default-search-path=%{l_prefix}/share/sgml \
+        --disable-shared \
+        --disable-nls
     %{l_make} %{l_mflags -O}
 
 %install
     rm -rf $RPM_BUILD_ROOT
-    %{l_shtool} mkdir -f -p -m 755 \
-        $RPM_BUILD_ROOT%{l_prefix}/bin \
-        $RPM_BUILD_ROOT%{l_prefix}/lib/opensd \
-        $RPM_BUILD_ROOT%{l_prefix}/include/opensd \
-        $RPM_BUILD_ROOT%{l_prefix}/share/sgml/opensd
-    %{l_make} %{l_mflags} install \
-        prefix=$RPM_BUILD_ROOT%{l_prefix} \
-        exec_prefix=$RPM_BUILD_ROOT%{l_prefix} \
-        datadir=$RPM_BUILD_ROOT%{l_prefix}/share/sgml/opensd
-#    %{l_shtool} install -c -m 644 \
-#        dsssl/* $RPM_BUILD_ROOT%{l_prefix}/share/sgml/opensd/
-#    echo 'CATALOG "openjade/catalog"' >$RPM_BUILD_ROOT%{l_prefix}/share/sgml/catalog
-#    %{l_shtool} install -c -m 755 -e 's;@l_prefix@;%{l_prefix};g' \
-#        %{SOURCE mkcatalog} $RPM_BUILD_ROOT%{l_prefix}/bin/
-#    rm -f $RPM_BUILD_ROOT%{l_prefix}/share/sgml/openjade/ChangeLog
-#    strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
-    %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
+    %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
+    rm -rf $RPM_BUILD_ROOT%{l_prefix}/doc
+    rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/sgml/doc
+    strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
+    %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
+        %{l_files_std} \
+        '%not %dir %{l_prefix}/share/sgml'
 
 %files -f files
 
 %clean
     rm -rf $RPM_BUILD_ROOT
 
+%post
+    if [ $1 -eq 1 ]; then
+        $RPM_INSTALL_PREFIX/bin/mkcatalog -q install OpenSP
+    fi
+
+%preun
+    if [ $1 -eq 0 ]; then
+        $RPM_INSTALL_PREFIX/bin/mkcatalog -q deinstall OpenSP
+    fi
+