Packman Build Service PMBS

gostcrypt.changes Changed

gostcrypt.spec Changed

@@ -17,21 +17,33 @@
 
 Name:           gostcrypt
 Version:        1.0
+%if 0%{?fedora}
+Release:        0%{?dist}
+%else
 Release:        0
+%endif
 License:        TrueCrypt Collective License and GPL-3.0
 Summary:        Free Open-Source Disk Encryption Software
 Url:            http://www.gostcrypt.org
 Group:          Productivity/Security
 Source:         http://www.gostcrypt.org/download/%{version}/linux/GostCrypt_Linux_%{version}.tar.gz
+Source1:        %{name}.desktop
 # PATCH-FIX-UPSTREAM gostcrypt-1.0-tc_token_err.patch
 Patch0:         gostcrypt-1.0-tc_token_err.patch
 # PATCH-FIX-UPSTREAM gostcrypt-1.0-long-long-32bit.patch
 Patch1:         gostcrypt-1.0-long-long-32bit.patch
 BuildRequires:  gcc-c++
-BuildRequires:  wxWidgets-wxcontainer-devel
 BuildRequires:  fuse-devel
+%if 0%{?suse_version}
 BuildRequires:  update-desktop-files
+BuildRequires:  wxWidgets-wxcontainer-devel
 Requires:       libwx_gtk2u_core-2_8-0-compat-lib-wxcontainer
+%else
+%if 0%{?fedora}
+BuildRequires:  wxGTK-devel
+BuildRequires:  desktop-file-utils
+%endif
+%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -64,14 +76,20 @@
 install -m 0755 Main/%{name} %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{_datadir}/pixmaps
 install -m 0644 Resources/Icons/GostCrypt-48x48.xpm %{buildroot}%{_datadir}/pixmaps/%{name}.xpm
-%suse_update_desktop_file -c %{name} GostCrypt "On-the-fly Disk Encryption Software" %{name} %{name} "System;Security;"
+
+%if 0%{?suse_version}
+%suse_update_desktop_file -i %{name}
+%endif
+
+%if 0%{?fedora}
+desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE1}
+%endif
 
 %files
 %defattr(-,root,root)
 %{_bindir}/%{name}
 %{_datadir}/pixmaps/%{name}.xpm
 %{_datadir}/applications/%{name}.desktop
-# License.txt, License.html and GostCryptUserGuide.pdf have wrong excutable permission, rpmlint says; let's fix that:
-%attr(0644,root,root) %doc License.txt License.html "Release/Setup Files/GostCryptUserGuide.pdf"
+%doc License.txt License.html "Release/Setup Files/GostCryptUserGuide.pdf"
 
 %changelog

gostcrypt.desktop Added

Changes of Revision 2