diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 2b662f5..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -valknut-0.3.11.tar.bz2 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..8ba66fa --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +valknut-0.4.8.tar.bz2 diff --git a/Makefile b/Makefile deleted file mode 100644 index b070905..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: valknut -# $Id$ -NAME := valknut -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/sources b/sources index 5072653..f72a124 100644 --- a/sources +++ b/sources @@ -1 +1,3 @@ -d485a7ed734d6ceadc0067b7c4254a60 valknut-0.3.11.tar.bz2 +c25d68c447cb9deb4262befdde9fccea valknut-0.4.9.tar.bz2 +d239bde0200907a7912e30f10d9aef9f valknut-0.4.9-oxygen-icons.tar.gz +5e41ef96a728a7bef7a4f64e86c60cdc valknut-0.4.9-gnome-icons.tar.gz diff --git a/valknut.desktop b/valknut.desktop index d433267..a3c0f35 100644 --- a/valknut.desktop +++ b/valknut.desktop @@ -2,7 +2,7 @@ Encoding=UTF-8 Name=Valknut Comment=Direct Connect client -Icon=valknut.png +Icon=valknut Exec=valknut --disable-tray Terminal=false Type=Application diff --git a/valknut.png b/valknut.png deleted file mode 100644 index 0a94207..0000000 Binary files a/valknut.png and /dev/null differ diff --git a/valknut.spec b/valknut.spec index 94a671b..fce814f 100644 --- a/valknut.spec +++ b/valknut.spec @@ -1,22 +1,23 @@ Name: valknut -Version: 0.3.11 -Release: 4%{?dist} +Version: 0.4.9 +Release: 1%{?dist} Summary: Valknut is a QT Direct Connect client Group: Applications/Internet -License: GPLv2 +License: GPLv2+ and LGPLv3+ URL: http://sourceforge.net/projects/wxdcgui/ Source0: http://dl.sourceforge.net/wxdcgui/%{name}-%{version}.tar.bz2 -Source1: valknut.desktop -Source2: valknut.png +Source1: http://dl.sourceforge.net/wxdcgui/%{name}-%{version}-oxygen-icons.tar.gz +Source2: http://dl.sourceforge.net/wxdcgui/%{name}-%{version}-gnome-icons.tar.gz +Source3: valknut.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: dclib-devel = %{version} -BuildRequires: qt3-devel, desktop-file-utils, bzip2-devel +BuildRequires: dclib-devel >= 0.3.23 +BuildRequires: qt-devel, desktop-file-utils, bzip2-devel BuildRequires: openssl-devel %description -Valknut is a program the uses the Direct Connect protocol. It is compatible +Valknut is a program that uses the Direct Connect protocol. It is compatible with other DC clients, such as the original DC from Neomodus, DC++ and derivatives. Valknut also interoperates with all common DC hub software. @@ -24,24 +25,23 @@ derivatives. Valknut also interoperates with all common DC hub software. %prep %setup -q - %build -unset QTDIR && source %{_sysconfdir}/profile.d/qt.sh %configure --enable-mt -make %{?_smp_mflags} +make -k %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT - -%{__install} -p -D -m 644 %{SOURCE2} \ - $RPM_BUILD_ROOT%{_datadir}/pixmaps/valknut.png +rm ${RPM_BUILD_ROOT}%{_datadir}/applications/valknut.desktop +# install oxygen icon theme +tar xzf %{SOURCE1} -C ${RPM_BUILD_ROOT}%{_datadir}/%{name}/icons/appl +# install gnome icons theme +tar xzf %{SOURCE2} -C ${RPM_BUILD_ROOT}%{_datadir}/%{name}/icons/appl desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ - %{SOURCE1} - + %{SOURCE3} %clean rm -rf $RPM_BUILD_ROOT @@ -54,9 +54,45 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/valknut %{_datadir}/applications/fedora-valknut.desktop %{_datadir}/pixmaps/valknut.png - +%{_datadir}/icons/hicolor/128x128/apps/valknut.png +%{_datadir}/icons/hicolor/16x16/apps/valknut.png +%{_datadir}/icons/hicolor/22x22/apps/valknut.png +%{_datadir}/icons/hicolor/24x24/apps/valknut.png +%{_datadir}/icons/hicolor/32x32/apps/valknut.png +%{_datadir}/icons/hicolor/48x48/apps/valknut.png +%{_datadir}/icons/hicolor/64x64/apps/valknut.png +%{_mandir}/man1/valknut.1.gz %changelog + +* Mon Feb 16 2009 Milos Jakubicek - 0.4.9-1 +- Update to 0.4.9 +- Removed gcc4.4 patch (merged upstream) +- Fixed typo in description +- Fixed license tag +- Added oxygen/gnome icons themes as sources + +* Wed Feb 4 2009 Milos Jakubicek - 0.4.8-2 +- Added valknut-gcc44.patch to fix the build with gcc 4.4 + +* Wed Jan 28 2009 Milos Jakubicek - 0.4.8-1 +- Update to 0.4.8 +- Switch to QT4 +- Removed Source2:valknut.png (part of the source package now) +- Fixed desktop file +- Man pages +- Many bugfixes, code cleanup etc. +- Upload slot changes +- Major feature changes (together with dclib) mentioned in NEWS from 0.4.0 to 0.4.7: + 0.4.6: Segment size adjustable, Download folders from search, Warnings about settings, + 0.4.5: More search results returned, Switching active/passive mode, StrongDC compatible encryption, + Partial list uploads, Search window improvements, User list icon changes + 0.4.0: Nick tab completion improvements, Chat command improvements, Filelist storage changes, + Public hubs display improved, /rebuild command fixed and improved, Folder search results + +* Sun Jan 18 2009 Tomas Mraz 0.3.11-5 +- rebuild with new openssl + * Fri Apr 04 2008 Luke Macken 0.3.11-4 - Add qt3-devel to BuildRequires to fix build issue (#440837)