up to 10.6.0

diff --git a/ZendStudio.spec b/ZendStudio.spec
index 615f5715a59f2d2fc5b5ae2009db2d6653bb237c..3044e40f8588996c19704ba9d3d986ac92d3421a 100644 (file)
--- a/ZendStudio.spec
+++ b/ZendStudio.spec
@@ -1,29 +1,35 @@
 # TODO
 # - sync -pl
 # - contains: eclipse, jre - maybe can use system pkgs
-Summary:       ZendStudio - The PHP IDE
+Summary:       Zend Studio - The Leading PHP IDE
 Summary(pl.UTF-8):     ZendStudio - narzędzia do zarządzania serwerami WWW opartymi o PHP
 Name:          ZendStudio
-Version:       8.0.0
+Version:       10.6.0
 Release:       0.1
 License:       Zend Studio License
 Group:         Applications
-Source0:       http://downloads.zend.com/studio-eclipse/%{version}/%{name}-%{version}-x86.tar.gz
-# NoSource0-md5:       9b5b7946ffb9d99362a224f5605c8e6e
+Source0:       http://downloads.zend.com/studio-eclipse/%{version}/%{name}-%{version}-linux.gtk.x86.tar.gz
+# NoSource0-md5:       d618f10c50d5077b1d6c72406d5a57d6
 NoSource:      0
-Source1:       http://downloads.zend.com/studio-eclipse/%{version}/%{name}-%{version}-x86_64.tar.gz
-# NoSource1-md5:       b4bd2f7a7b351db59ebb218653a5cb76
+Source1:       http://downloads.zend.com/studio-eclipse/%{version}/%{name}-%{version}-linux.gtk.x86_64.tar.gz
+# NoSource1-md5:       3ca8d2aa435070d8405b290875dbd610
 NoSource:      1
 URL:           http://www.zend.com/products/studio/
 BuildRequires: rpm-pythonprov
 ExclusiveArch: %{ix86} %{x8664}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define                _appdir         %{_libdir}/%{name}
+
 # no Provides for privately packaged libs
 %define                _noautoprov             libpng12.so.0
 %define                _noautoreq              %{_noautoprov}
 
-%define                _appdir         %{_libdir}/%{name}
+# don't strip anything. strip crashes, and if it succeeds then ZS crashes
+%define                _noautostrip    .*%{_appdir}/.*
+
+# otherwise it builds this package two decades
+%define                _noautoprovfiles        %{_appdir}/.*
 
 %description
 Zend Studio is our professional-grade PHP IDE (Integrated Development
@@ -44,14 +50,14 @@ utrzymywanie bezpieczeństwa.
 %ifarch %{x8664}
 %setup -qcT -b 1
 %endif
-mv %{name} .unp && mv .unp/* .unp/.eclipseproduct .
+mv %{name} .unp && mv .unp/* .unp/.eclipseproduct . && rmdir .unp
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_appdir}
 
 # test if we can hardlink -- %{_builddir} and $RPM_BUILD_ROOT on same partition
-if cp -al notice.html $RPM_BUILD_ROOT/notice.html 2>/dev/null; then
+if cp -al notice.html $RPM_BUILD_ROOT/notice.html; then
        l=l
        rm -f $RPM_BUILD_ROOT/notice.html
 fi
@@ -69,11 +75,11 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_appdir}/ZendStudio
 %attr(755,root,root) %{_appdir}/libcairo-swt.so
 
+# use actual file permissions from source tarball. fix this later
+%defattr(-,root,root,-)
+
 %{_appdir}/.eclipseproduct
-%{_appdir}/docs
 %{_appdir}/readme
-%{_appdir}/about_files
-%{_appdir}/about.html
 %{_appdir}/epl-v10.html
 %{_appdir}/notice.html
 
@@ -85,5 +91,3 @@ rm -rf $RPM_BUILD_ROOT
 %{_appdir}/artifacts.xml
 %{_appdir}/features
 %{_appdir}/plugins
-
-%{_appdir}/jre