rpms/klibido/F-7 klibido-0.2.5-desktop_file.patch, NONE, 1.1 klibido-0.2.5-doc_relative_symlinks.patch, NONE, 1.1 klibido-0.2.5-fix_pause_queue.patch, NONE, 1.1 klibido-0.2.5-gcc4_extra_qualification.patch, NONE, 1.1 klibido.spec, NONE, 1.1 sources, 1.1, 1.2

Francois Aucamp (faucamp) fedora-extras-commits at redhat.com
Fri Jun 15 10:27:07 UTC 2007


Author: faucamp

Update of /cvs/pkgs/rpms/klibido/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21946

Modified Files:
	sources 
Added Files:
	klibido-0.2.5-desktop_file.patch 
	klibido-0.2.5-doc_relative_symlinks.patch 
	klibido-0.2.5-fix_pause_queue.patch 
	klibido-0.2.5-gcc4_extra_qualification.patch klibido.spec 
Log Message:
Initial import of KLibido into Fedora 7


klibido-0.2.5-desktop_file.patch:

--- NEW FILE klibido-0.2.5-desktop_file.patch ---
diff -uNr klibido-0.2.5/src/klibido.desktop klibido-0.2.5-mod/src/klibido.desktop
--- klibido-0.2.5/src/klibido.desktop	2004-09-02 01:34:50.000000000 +0200
+++ klibido-0.2.5-mod/src/klibido.desktop	2007-06-05 13:02:45.000000000 +0200
@@ -1,10 +1,11 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=klibido
-Name[xx]=xxklibidoxx
+Name=KLibido
+Name[xx]=xxKLibidoxx
 Exec=klibido
 Icon=klibido
 Type=Application
-Comment=KDE nntp (usenet) binaries grabber
+GenericName=NNTP (Usenet) file grabber
+Comment=NNTP (Usenet) file grabber
 Categories=Qt;KDE;Network
 

klibido-0.2.5-doc_relative_symlinks.patch:

--- NEW FILE klibido-0.2.5-doc_relative_symlinks.patch ---
diff -uNr klibido-0.2.5/doc/en/Makefile.in klibido-0.2.5-mod/doc/en/Makefile.in
--- klibido-0.2.5/doc/en/Makefile.in	2006-03-04 12:29:06.000000000 +0200
+++ klibido-0.2.5-mod/doc/en/Makefile.in	2006-11-08 00:05:13.000000000 +0200
@@ -483,7 +483,7 @@
 	$(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/klibido/; \
 	fi
 	-rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/klibido/common
-	$(LN_S) $(kde_libs_htmldir)/$(KDE_LANG)/common $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/klibido/common
+	$(LN_S) ../common $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/klibido/common
 
 uninstall-docs:
 	-rm -rf $(kde_htmldir)/$(KDE_LANG)/klibido

klibido-0.2.5-fix_pause_queue.patch:

--- NEW FILE klibido-0.2.5-fix_pause_queue.patch ---
diff -uNr klibido-0.2.5/src/klibido.cpp klibido-0.2.5-mod/src/klibido.cpp
--- klibido-0.2.5/src/klibido.cpp	2006-03-04 12:29:01.000000000 +0200
+++ klibido-0.2.5-mod/src/klibido.cpp	2006-12-06 11:57:42.000000000 +0200
@@ -662,7 +662,7 @@
 
 void klibido::slotPauseQ( )
 {
-	KToggleAction *actionQ=(KToggleAction*)actionCollection()->action(i18n("pause_queue"));
+	KToggleAction *actionQ=(KToggleAction*)actionCollection()->action("pause_queue");
 	if (actionQ->isChecked()) { //Pause the queue
 		actionQ->setText(("Resume Queue"));
 		actionQ->setIconSet(KGlobal::iconLoader()->loadIcon("connect_no",KIcon::Toolbar, 0, false));

klibido-0.2.5-gcc4_extra_qualification.patch:

--- NEW FILE klibido-0.2.5-gcc4_extra_qualification.patch ---
diff -uNr klibido-0.2.5/src/nntpthreadsocket.h klibido-0.2.5-mod/src/nntpthreadsocket.h
--- klibido-0.2.5/src/nntpthreadsocket.h	2006-01-07 00:05:32.000000000 +0200
+++ klibido-0.2.5-mod/src/nntpthreadsocket.h	2006-11-07 20:45:22.000000000 +0200
@@ -234,7 +234,7 @@
 		bool getHead(QString group, int artnum); //Unimplemented
 		int m_getError() {return error;}
     	const char *m_getErrorDesc() {return (const char *) errorString;}
-		char * NntpThreadSocket::m_findEndLine( char * start, char * end );
+		char * m_findEndLine( char * start, char * end );
 		void setHost(NntpHost *nh);
 		bool m_sendCmd( QString& cmd, int response );
 		QTime prevTime, currentTime;
diff -uNr klibido-0.2.5/src/yydecoder.h klibido-0.2.5-mod/src/yydecoder.h
--- klibido-0.2.5/src/yydecoder.h	2005-03-09 13:18:55.000000000 +0200
+++ klibido-0.2.5-mod/src/yydecoder.h	2006-11-07 20:45:02.000000000 +0200
@@ -87,7 +87,7 @@
 	
 private:
 	
-	inline void yyDecoder::charCRC(const unsigned char *c);
+	inline void charCRC(const unsigned char *c);
 	
 	QStringList m_fileParts;
 	QStringList::Iterator fileIterator;


--- NEW FILE klibido.spec ---
Name:           klibido
Version:        0.2.5
Release:        7%{?dist}
Summary:        NNTP (Usenet) file grabber for KDE

Group:          Applications/Internet
License:        GPL
URL:            http://klibido.sourceforge.net
Source0:        http://kent.dl.sourceforge.net/sourceforge/klibido/%{name}-%{version}.tar.gz
Patch0:         klibido-0.2.5-gcc4_extra_qualification.patch
Patch1:         klibido-0.2.5-doc_relative_symlinks.patch
Patch2:         klibido-0.2.5-fix_pause_queue.patch
Patch3:         klibido-0.2.5-desktop_file.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  uulib-devel kdelibs-devel db4-devel desktop-file-utils ImageMagick


%description
KLibido (KDE LInux BInaries DOwnloader) is a KDE program to download encoded
articles from the usenet news service, using the nntp protocol. It supports
multiple servers, multiple download threads per server, newzbin (.nzb) files,
automatic joining and decoding of articles.

KLibido is not a newsreader. It doesn't let you easily display the articles -
only their subject, and it discards all non-binary posts.


%prep
%setup -q
%patch0 -p1 -b .gcc4_patch
%patch1 -p1 -b .relative_symlinks
%patch2 -p1 -b .pause_queue
%patch3 -p1 -b .desktop_file


%build
%configure --prefix=$(kde-config --prefix) --disable-rpath
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
desktop-file-install --vendor="fedora" \
        --dir=$RPM_BUILD_ROOT%{_datadir}/applications/ \
        $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/%{name}.desktop
rm -f $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/%{name}.desktop
# Install a 48x48 icon
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
convert $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/klibido.png \
        -sample 48x48 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/klibido.png
%find_lang %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README TODO
%{_bindir}/klibido
%{_datadir}/applications/fedora-klibido.desktop
%{_datadir}/apps/klibido
%{_datadir}/doc/HTML/en/klibido
%{_datadir}/icons/hicolor/16x16/apps/klibido.png
%{_datadir}/icons/hicolor/32x32/apps/klibido.png
%{_datadir}/icons/hicolor/48x48/apps/klibido.png


%changelog
* Fri Jun 15 2007 Franocis Aucamp <faucamp at csir.co.za> - 0.2.5-7
- Reverted to BuildRequires: uulib-devel (to build for FC6 and F7)
- Removed unnecessary hicolor-icon-theme dependency

* Tue Jun 05 2007 Francois Aucamp <faucamp at csir.co.za> - 0.2.5-6
- Spec now consistently uses RPM_BUILD_ROOT
- Changed uulib BuildRequires to uulib-static for Fedora 7 and up
- Added hicolor-icon-theme dependency
- Added "desktop_file" patch to fix some minor issues in the .desktop file

* Mon Apr 16 2007 Francois Aucamp <faucamp at csir.co.za> - 0.2.5-5
- Create a 48x48 icon
- Added BuilRequires: ImageMagick

* Wed Jan 10 2007 Francois Aucamp <faucamp at csir.co.za> - 0.2.5-4
- Added proper handling of .desktop file
- Added BuildRequires: desktop-file-utils

* Thu Dec 07 2006 Francois Aucamp <faucamp at csir.co.za> - 0.2.5-3
- Added missing BuildRequires: kdelibs-devel db4-devel

* Wed Dec 06 2006 Francois Aucamp <faucamp at csir.co.za> - 0.2.5-2
- Added "fix_pause_queue" patch to fix upstream bug 1485588
- Renamed patch files to reflect klibido version used to create them

* Tue Nov 07 2006 Francois Aucamp <faucamp at csir.co.za> - 0.2.5-1
- Initial RPM build


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/klibido/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Jun 2007 00:38:17 -0000	1.1
+++ sources	15 Jun 2007 10:26:31 -0000	1.2
@@ -0,0 +1 @@
+e343338541a3ff3f2983023ccc922af0  klibido-0.2.5.tar.gz




More information about the scm-commits mailing list