- drop obsolete and outdated manual inclusion of rpm macros

[packages/phpstorm.git] / phpstorm.spec

diff --git a/phpstorm.spec b/phpstorm.spec
index a2dd9dc7950a59d4d4493e23a6fe25486a9e6665..4961f39f7b38d1972ce8199130bc90f26fd42356 100644 (file)
--- a/phpstorm.spec
+++ b/phpstorm.spec
@@ -1,26 +1,28 @@
-%include       /usr/lib/rpm/macros.java
 Summary:       Lightweight and Smart PHP IDE
 Name:          phpstorm
-Version:       7.1.3
+Version:       2017.1.4
 Release:       1
 # TODO: figure out what's the licensing and redistribution
 License:       ?
 Group:         Development/Tools
-Source0:       http://download.jetbrains.com/webide/PhpStorm-%{version}.tar.gz
-# NoSource0-md5:       5c68dce5fa53ce2ff42fa8a590561c40
+Source0:       https://download.jetbrains.com/webide/PhpStorm-%{version}.tar.gz
+# NoSource0-md5:       1aa6f479b6edb92586388acb0b8e73a2
 NoSource:      0
 Source1:       %{name}.desktop
+Source2:       %{name}.py
 Patch0:                pld.patch
 URL:           http://www.jetbrains.com/phpstorm/
 BuildRequires: jpackage-utils
 BuildRequires: rpm-javaprov
 BuildRequires: rpmbuild(macros) >= 1.300
 BuildRequires: unzip
-Requires:      jre >= 1.6
+Requires:      jre-X11 >= 1.7
 Requires:      which
 Suggests:      cvs
 Suggests:      git-core
+Suggests:      java-jdbc-mysql
 Suggests:      subversion
+Conflicts:     java-jdbc-mysql < 5.1.22
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # don't strip fsnotifier, it's size is checked for "outdated binary"
@@ -43,7 +45,7 @@ Note: PhpStorm includes all the functionality of WebStorm (HTML/CSS
 Editor, JavaScript Editor) and adds full-fledged support for PHP.
 
 %prep
-%setup -qn PhpStorm-133.982
+%setup -qn PhpStorm-171.4694.2
 
 # keep only single arch files (don't want to pull 32bit deps by default),
 # if you want to mix, install rpm from both arch
@@ -59,10 +61,10 @@ rm bin/libyjpagent-linux.so
 rm bin/phpstorm.vmoptions
 rm -r lib/libpty/linux/x86
 %endif
-rm -r lib/libpty/{macosx,win}
+rm bin/fsnotifier-arm
 %patch0 -p1
-chmod a+rx bin/*.so bin/fsnotifier*
-mv bin/webide.png .
+chmod a+rx bin/*.so bin/fsnotifier* lib/libpty/linux/*/libpty.so
+mv bin/phpstorm.png .
 
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -71,11 +73,12 @@ find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_appdir},%{_bindir},%{_pixmapsdir},%{_desktopdir}}
 cp -l build.txt $RPM_BUILD_ROOT/cp-test && l=l && rm -f $RPM_BUILD_ROOT/cp-test
-cp -a$l bin help lib license plugins $RPM_BUILD_ROOT%{_appdir}
+cp -a$l bin help lib plugins $RPM_BUILD_ROOT%{_appdir}
 ln -s %{_pixmapsdir}/%{name}.png $RPM_BUILD_ROOT%{_appdir}/bin
-cp -p webide.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
+cp -p phpstorm.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
-ln -s %{_appdir}/bin/phpstorm.sh $RPM_BUILD_ROOT%{_bindir}/phpstorm
+install -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/pstorm
+ln -s pstorm $RPM_BUILD_ROOT%{_bindir}/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -83,23 +86,23 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/%{name}
+%attr(755,root,root) %{_bindir}/pstorm
 %dir %{_appdir}
 %{_appdir}/help
-%{_appdir}/license
 %{_appdir}/plugins
 %dir %{_appdir}/bin
 %{_appdir}/bin/%{name}*.vmoptions
+%{_appdir}/bin/%{name}.png
 %{_appdir}/bin/idea.properties
 %{_appdir}/bin/log.xml
-%{_appdir}/bin/%{name}.png
 %attr(755,root,root) %{_appdir}/bin/%{name}.sh
-%attr(755,root,root) %{_appdir}/bin/inspect.sh
+%attr(755,root,root) %{_appdir}/bin/*.py
+%attr(755,root,root) %{_appdir}/bin/format.sh
 %attr(755,root,root) %{_appdir}/bin/fsnotifier*
+%attr(755,root,root) %{_appdir}/bin/inspect.sh
 %attr(755,root,root) %{_appdir}/bin/libyjpagent-linux*.so
 %dir %{_appdir}/lib
 %{_appdir}/lib/*.jar
-%dir %{_appdir}/lib/ext
-%{_appdir}/lib/ext/*.jar
 %dir %{_appdir}/lib/libpty
 %dir %{_appdir}/lib/libpty/linux
 %dir %{_appdir}/lib/libpty/linux/x86*