Packman Build Service PMBS

Changes of Revision 8

dxirc.changes Changed

dxirc.spec Changed

@@ -26,7 +26,6 @@
 Source0:        dxirc-%{version}.tar.xz
 BuildRequires:  cmake
 BuildRequires:  fdupes
-BuildRequires:  fox16-devel
 BuildRequires:  gcc-c++
 BuildRequires:  gettext
 BuildRequires:  hicolor-icon-theme
@@ -36,41 +35,41 @@
 BuildRequires:  pkgconfig(Qt5Widgets)
 BuildRequires:  pkgconfig(openssl)
 BuildRequires:  update-desktop-files
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  lua51-devel
 Provides:       dxirc-data = %{version}-%{release}
 Obsoletes:      dxirc-data < %{version}-%{release}
-Provides:       dxirc-fox = %{version}-%{release}
-Obsoletes:      dxirc-fox < %{version}-%{release}
 Provides:       dxirc-qt = %{version}-%{release}
 Obsoletes:      dxirc-qt < %{version}-%{release}
+Conflicts:      dxirc-fox < %{version}-%{release}
+Conflicts:      dxirc-fox > %{version}-%{release}
 
 %description
 Dxirc is simple IRC client. dxirc is desktop independent and is written with
-the C++ Fox Toolkit.
+the Qt Toolkit.
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
-%cmake
-make %{?_smp_mflags}
+CXXFLAGS='%{optflags} -Wno-deprecated-declarations'
+%cmake \
+	-DBUILD_FOX=false \
+	%{nil}
+%cmake_build
 
 %install
 %cmake_install
-find %{buildroot} -ls
 find %{buildroot} -name COPYING -print -delete
-ln -sv %{name}-fox %{buildroot}%{_bindir}/%{name}
+find %{buildroot} -name %{name}-fox.desktop -print -delete
+ln -sfv %{name}-qt %{buildroot}%{_bindir}/%{name}
 %find_lang %{name}
 
-%suse_update_desktop_file -r %{name}-fox Network IRCClient
 %suse_update_desktop_file -r %{name}-qt Network IRCClient
 
 %fdupes -s %{buildroot}%{_datadir}/%{name}/icons
 
 %files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc COPYING
+%license COPYING
 %{_bindir}/*
 %{_datadir}/applications
 %{_datadir}/%{name}