- upgraded to version 1.0

- removed doubled product

Changed files:
    Zope-Silva.spec -> 1.10

diff --git a/Zope-Silva.spec b/Zope-Silva.spec
index f0ac139192639b9a801daef2d3048a7a0de2d5e0..d7a8f1e11cb147f8257bd0aa2ed0aafd5799939d 100644 (file)
--- a/Zope-Silva.spec
+++ b/Zope-Silva.spec
@@ -3,13 +3,13 @@
 Summary:       A Zope-based web application
 Summary(pl):   Aplikacja dla stron WWW oparta na Zope
 Name:          Zope-%{zope_subname}
-%define                sub_ver b1
+# %%define             sub_ver b1
 Version:       1.0
-Release:       0.%{sub_ver}.1
+Release:       1
 License:       Distributable
 Group:         Development/Tools
-Source0:       http://zope.org/Members/infrae/%{zope_subname}/%{zope_subname}-%{version}%{sub_ver}/%{zope_subname}-%{version}%{sub_ver}-all.tgz
-# Source0-md5: 491da24183aa129a5397afbda6765452
+Source0:       http://zope.org/Members/infrae/%{zope_subname}/%{zope_subname}-%{version}/%{zope_subname}-%{version}-all.tgz
+# Source0-md5: 84468c0e6829db57c7555adb1469cadc
 URL:           http://zope.org/Members/infrae/Silva/
 %pyrequires_eq python-modules
 Requires:      Zope >= 2.6.1
@@ -33,12 +33,12 @@ tworzenia i zarz
 
 %build
 # remove dirs - additional packages!
-rm -rf Formulator
+rm -rf {Formulator,FileSystemSite}
 
-mkdir docs docs/Annotations docs/FileSystemSite docs/ParsedXML docs/ProxyIndex docs/Silva docs/SilvaDocument \
+mkdir docs docs/Annotations docs/ParsedXML docs/ProxyIndex docs/Silva docs/SilvaDocument \
     docs/SilvaMetadata docs/SilvaViews docs/XMLWidgets docs/kupu
 mv -f Annotations/{CREDITS.txt,HISTORY.txt,INSTALL.txt,README.txt} docs/Annotations
-mv -f FileSystemSite/README.txt docs/FileSystemSite
+# mv -f FileSystemSite/README.txt docs/FileSystemSite
 mv -f ParsedXML/{CHANGES.txt,CREDITS.txt,INSTALL.txt,README.txt} docs/ParsedXML
 mv -f ProxyIndex/{CREDITS.txt,HISTORY.txt,INSTALL.txt,README.txt} docs/ProxyIndex
 mv -f Silva/{CREDITS.txt,HISTORY.txt,INSTALL.txt,README.txt,TROUBLESHOOTING.txt,UPGRADE.txt} docs/Silva
@@ -55,7 +55,7 @@ rm -rf kupu/{Makefile,make.bat}
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_datadir}/%{name}
 
-cp -af {Annotations,FileSystemSite,ParsedXML,ProxyIndex,Silva,SilvaDocument,SilvaMetadata,SilvaViews,XMLWidgets,kupu} \
+cp -af {Annotations,ParsedXML,ProxyIndex,Silva,SilvaDocument,SilvaMetadata,SilvaViews,XMLWidgets,kupu} \
     $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 %py_comp $RPM_BUILD_ROOT%{_datadir}/%{name}
@@ -68,7 +68,7 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/docs
 rm -rf $RPM_BUILD_ROOT
 
 %post
-for p in Annotations FileSystemSite ParsedXML ProxyIndex Silva SilvaDocument SilvaMetadata SilvaViews XMLWidgets kupu; do
+for p in Annotations ParsedXML ProxyIndex Silva SilvaDocument SilvaMetadata SilvaViews XMLWidgets kupu; do
     /usr/sbin/installzopeproduct %{_datadir}/%{name}/$p
 done
 if [ -f /var/lock/subsys/zope ]; then
@@ -77,7 +77,7 @@ fi
 
 %postun
 if [ "$1" = "0" ]; then
-    for p in Annotations FileSystemSite ParsedXML ProxyIndex Silva SilvaDocument SilvaMetadata SilvaViews XMLWidgets kupu; do
+    for p in Annotations ParsedXML ProxyIndex Silva SilvaDocument SilvaMetadata SilvaViews XMLWidgets kupu; do
         /usr/sbin/installzopeproduct -d $p
     done
 fi