- added R: nxssh

- adaptarized
- rel 2

Changed files:
    freenx-client.spec -> 1.6

diff --git a/freenx-client.spec b/freenx-client.spec
index d13ce61eea610277ce0ed703fe74cb93b2ee6762..2e7abdf846bf8e4ebac04007166048005c28df71 100644 (file)
--- a/freenx-client.spec
+++ b/freenx-client.spec
@@ -1,26 +1,27 @@
 Summary:       a Free NoMachine (NX) client
 Name:          freenx-client
 Version:       0.9
 Summary:       a Free NoMachine (NX) client
 Name:          freenx-client
 Version:       0.9

-Release:       1
+Release:       2

 License:       GPL v2 or later
 Group:         X11/Applications/Networking
 Patch0:                %{name}-keypath.patch
 URL:           http://freenx.berlios.de/
 License:       GPL v2 or later
 Group:         X11/Applications/Networking
 Patch0:                %{name}-keypath.patch
 URL:           http://freenx.berlios.de/

-BuildRequires: doxygen
-BuildRequires: libnxcl-devel
+BuildRequires: QtCore-devel >= 4.4.0

 BuildRequires: QtGui-devel >= 4.4.0
 BuildRequires: QtXml-devel >= 4.4.0
 BuildRequires: QtGui-devel >= 4.4.0
 BuildRequires: QtXml-devel >= 4.4.0

-BuildRequires: QtCore-devel >= 4.4.0
-BuildRequires: qt4-qmake >= 4.4.0
+BuildRequires: doxygen
+BuildRequires: libnxcl-devel

 BuildRequires: qt4-build >= 4.4.0
 BuildRequires: qt4-build >= 4.4.0

+BuildRequires: qt4-qmake >= 4.4.0

 Requires(post,postun): desktop-file-utils
 Requires(post,postun): hicolor-icon-theme
 Requires(post,postun): shared-mime-info
 Requires(post,postun): desktop-file-utils
 Requires(post,postun): hicolor-icon-theme
 Requires(post,postun): shared-mime-info

-Source0:        http://download.berlios.de/freenx/freenx-client-%{version}.tar.bz2
+Requires:      nxssh
+Source0:       http://download.berlios.de/freenx/%{name}-%{version}.tar.bz2

 Source1:       %{name}.desktop
 Source2:       %{name}.svg
 # Source0-md5:  777b3cda7a245e3870d4870a9460cb73
 Source1:       %{name}.desktop
 Source2:       %{name}.svg
 # Source0-md5:  777b3cda7a245e3870d4870a9460cb73

-BuildRoot:      %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)

 
 
 %description
 
 
 %description


@@ -33,19 +34,19 @@ This is a free implementation of a NX session client.
 %build
 cd qtnx
 qmake-qt4
 %build
 cd qtnx
 qmake-qt4

-%{__make} 
+%{__make}

 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{_bindir}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{_bindir}

-install qtnx/qtnx $RPM_BUILD_ROOT%{_bindir} 
+install qtnx/qtnx $RPM_BUILD_ROOT%{_bindir}

 install -d $RPM_BUILD_ROOT%{_datadir}/%{name}
 install qtnx/id.key $RPM_BUILD_ROOT%{_datadir}/%{name}/default.key
 install -d $RPM_BUILD_ROOT%{_iconsdir}/hicolor/scalable/apps/
 install %{SOURCE2} $RPM_BUILD_ROOT%{_iconsdir}/hicolor/scalable/apps/
 install -d $RPM_BUILD_ROOT%{_datadir}/%{name}
 install qtnx/id.key $RPM_BUILD_ROOT%{_datadir}/%{name}/default.key
 install -d $RPM_BUILD_ROOT%{_iconsdir}/hicolor/scalable/apps/
 install %{SOURCE2} $RPM_BUILD_ROOT%{_iconsdir}/hicolor/scalable/apps/

-install -d $RPM_BUILD_ROOT%{_datadir}/applications/
-install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+install -d $RPM_BUILD_ROOT%{_desktopdir}/
+install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop

 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT


@@ -66,4 +67,4 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/*.key
 %{_iconsdir}/*/*/apps/%{name}.svg
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/*.key
 %{_iconsdir}/*/*/apps/%{name}.svg

-%{_datadir}/applications/%{name}.desktop
+%{_desktopdir}/%{name}.desktop