docbook-dtds-1.0-55

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@3812 ec354946-7b23-47d6-9f5a-488ba84defc7

d/docbook-dtds/docbook-dtds-vl.spec

@@ -1,6 +1,6 @@
 Name: docbook-dtds
 Version: 1.0
-Release: 54%{?_dist_release}
+Release: 55%{?_dist_release}
 Group: Applications/Text
 
 Summary: SGML and XML document type definitions for DocBook.
@@ -202,7 +202,7 @@ rm -rf $RPM_BUILD_ROOT
 # Symlinks
 mkdir -p $RPM_BUILD_ROOT/etc/sgml
 for fmt in sgml xml; do
-  ln -s $fmt-docbook-4.5-%{version}-%{release}.cat \
+  ln -s $fmt-docbook-4.5.cat \
      $RPM_BUILD_ROOT/etc/sgml/$fmt-docbook.cat
 done
 
@@ -210,8 +210,8 @@ eval set %{version_list}
 for dir
 do
   cd $dir
-  fmt=${dir#*-} vvr=${dir%%-*}-%{version}-%{release}
-  DESTDIR=$RPM_BUILD_ROOT%{_datadir}/sgml/docbook/$fmt-dtd-$vvr
+  fmt=${dir#*-} ver=${dir%%-*}
+  DESTDIR=$RPM_BUILD_ROOT%{_datadir}/sgml/docbook/$fmt-dtd-$ver
   case $fmt in
     sgml)   mkdir -p $DESTDIR ; install *.dcl $DESTDIR ;;
     xml)    mkdir -p $DESTDIR/ent ; install ent/* $DESTDIR/ent ;;
@@ -220,7 +220,7 @@ do
   install docbook.cat $DESTDIR/catalog
   cd ..
   # File for %%ghost
-  touch $RPM_BUILD_ROOT/etc/sgml/$fmt-docbook-$vvr.cat
+  touch $RPM_BUILD_ROOT/etc/sgml/$fmt-docbook-$ver.cat
 done
 
 
@@ -251,12 +251,12 @@ esac
 eval set %{version_list}
 for dir
 do
-  fmt=${dir#*-} ver=${dir%%-*} vvr=$ver-%{version}-%{release}
-  sgmldir=%{_datadir}/sgml/docbook/$fmt-dtd-$vvr
+  fmt=${dir#*-} ver=${dir%%-*}
+  sgmldir=%{_datadir}/sgml/docbook/$fmt-dtd-$ver
   ## SGML catalog
   # Update the centralized catalog corresponding to this version of the DTD
   for cat_dir in %{_datadir}/sgml/sgml-iso-entities-8879.1986 $sgmldir $STYLESHEETS; do
-    $catcmd --sgml --add /etc/sgml/$fmt-docbook-$vvr.cat $cat_dir/catalog
+    $catcmd --sgml --add /etc/sgml/$fmt-docbook-$ver.cat $cat_dir/catalog
   done
   ## XML catalog
   if [ $fmt = xml -a -w $xmlcatalog ]; then
@@ -361,12 +361,12 @@ ent/iso-cyr2.ent
 eval set %{version_list}
 for dir
 do
-  fmt=${dir#*-} ver=${dir%%-*} vvr=$ver-%{version}-%{release}
-  sgmldir=%{_datadir}/sgml/docbook/$fmt-dtd-$vvr
+  fmt=${dir#*-} ver=${dir%%-*}
+  sgmldir=%{_datadir}/sgml/docbook/$fmt-dtd-$ver
   ## SGML catalog
   # Update the centralized catalog corresponding to this version of the DTD
-  $catcmd --sgml --del /etc/sgml/catalog /etc/sgml/$fmt-docbook-$vvr.cat
-  rm -f /etc/sgml/$fmt-docbook-$vvr.cat
+  $catcmd --sgml --del /etc/sgml/catalog /etc/sgml/$fmt-docbook-$ver.cat
+  rm -f /etc/sgml/$fmt-docbook-$ver.cat
   ## XML catalog
   if [ $fmt = xml -a -w $xmlcatalog ]; then
     for f in $entities; do
@@ -392,8 +392,8 @@ sed -ni '
 eval set %{version_list}
 for dir
 do
-  fmt=${dir#*-} ver=${dir%%-*} vvr=$ver-%{version}-%{release}
-  %{_bindir}/xmlcatalog --sgml --noout --add /etc/sgml/$fmt-docbook-$vvr.cat \
+  fmt=${dir#*-} ver=${dir%%-*}
+  %{_bindir}/xmlcatalog --sgml --noout --add /etc/sgml/$fmt-docbook-$ver.cat \
     %{_datadir}/sgml/openjade-%{openjadever}/catalog
 done
 
@@ -403,8 +403,8 @@ done
 eval set %{version_list}
 for dir
 do
-  fmt=${dir#*-} ver=${dir%%-*} vvr=$ver-%{version}-%{release}
-  %{_bindir}/xmlcatalog --sgml --noout --del /etc/sgml/$fmt-docbook-$vvr.cat \
+  fmt=${dir#*-} ver=${dir%%-*}
+  %{_bindir}/xmlcatalog --sgml --noout --del /etc/sgml/$fmt-docbook-$ver.cat \
     %{_datadir}/sgml/openjade-%{openjadever}/catalog
 done
 
@@ -416,22 +416,25 @@ done
 %doc --parents */*.txt
 %config(noreplace) /etc/sgml/sgml-docbook.cat
 %config(noreplace) /etc/sgml/xml-docbook.cat
-%{_datadir}/sgml/docbook/sgml-dtd-3.0-%{version}-%{release}
-%{_datadir}/sgml/docbook/sgml-dtd-3.1-%{version}-%{release}
-%{_datadir}/sgml/docbook/sgml-dtd-4.0-%{version}-%{release}
-%{_datadir}/sgml/docbook/sgml-dtd-4.1-%{version}-%{release}
-%{_datadir}/sgml/docbook/sgml-dtd-4.2-%{version}-%{release}
-%{_datadir}/sgml/docbook/sgml-dtd-4.3-%{version}-%{release}
-%{_datadir}/sgml/docbook/sgml-dtd-4.4-%{version}-%{release}
-%{_datadir}/sgml/docbook/sgml-dtd-4.5-%{version}-%{release}
-%{_datadir}/sgml/docbook/xml-dtd-4.1.2-%{version}-%{release}
-%{_datadir}/sgml/docbook/xml-dtd-4.2-%{version}-%{release}
-%{_datadir}/sgml/docbook/xml-dtd-4.3-%{version}-%{release}
-%{_datadir}/sgml/docbook/xml-dtd-4.4-%{version}-%{release}
-%{_datadir}/sgml/docbook/xml-dtd-4.5-%{version}-%{release}
-%ghost %config(noreplace) /etc/sgml/*ml-docbook-*-%{version}-%{release}.cat
+%{_datadir}/sgml/docbook/sgml-dtd-3.0
+%{_datadir}/sgml/docbook/sgml-dtd-3.1
+%{_datadir}/sgml/docbook/sgml-dtd-4.0
+%{_datadir}/sgml/docbook/sgml-dtd-4.1
+%{_datadir}/sgml/docbook/sgml-dtd-4.2
+%{_datadir}/sgml/docbook/sgml-dtd-4.3
+%{_datadir}/sgml/docbook/sgml-dtd-4.4
+%{_datadir}/sgml/docbook/sgml-dtd-4.5
+%{_datadir}/sgml/docbook/xml-dtd-4.1.2
+%{_datadir}/sgml/docbook/xml-dtd-4.2
+%{_datadir}/sgml/docbook/xml-dtd-4.3
+%{_datadir}/sgml/docbook/xml-dtd-4.4
+%{_datadir}/sgml/docbook/xml-dtd-4.5
+%ghost %config(noreplace) /etc/sgml/*ml-docbook-*.cat
 
 %changelog
+* Sun May  8 2011 IWAI, Masaharu <iwai@alib.jp> 1.0-55
+- drop %%{version}-%%{release} in file path
+
 * Fri Apr 22 2011 IWAI, Masaharu <iwai@alib.jp> 1.0-54
 - add Requires(post,postun): sed