linux-fetion 1.3-3; openfetion 1.6.1-2

5 files changed, 70 insertions, 33 deletions

diff --git a/linux-fetion/F-13/Makefile b/linux-fetion/F-13/Makefile
deleted file mode 100644
index e69de29..0000000
--- a/linux-fetion/F-13/Makefile
+++ /dev/null
diff --git a/linux-fetion/F-13/linux-fetion-desktop.patch b/linux-fetion/F-13/linux-fetion-1.3-desktop.patch
index c592458..90d1234 100644
--- a/linux-fetion/F-13/linux-fetion-desktop.patch
+++ b/linux-fetion/F-13/linux-fetion-1.3-desktop.patch
@@ -1,11 +1,12 @@
 --- misc/LibFetion.desktop	2009-12-31 23:41:32.000000000 +0800
-+++ misc/LibFetion.desktop.new	2010-03-10 15:25:53.032932683 +0800
++++ misc/LibFetion.desktop.new	2010-06-13 21:29:44.593520546 +0800
 @@ -6,7 +6,6 @@
  GenericName[zh_CN]=Linux 飞信第三方客户程序
  Comment=Linux Fetion
  Comment[zh_CN]=Linux 飞信第三方客户程序
 -MimeTypes=
- Icon=fetion.png
+-Icon=fetion.png
 -Categories=Qt;KDE;Network
++Icon=linux-fetion.png
 +Categories=Qt;KDE;Network;
  Terminal=false
diff --git a/linux-fetion/F-13/linux-fetion.spec b/linux-fetion/F-13/linux-fetion.spec
index 4853529..74908f8 100644
--- a/linux-fetion/F-13/linux-fetion.spec
+++ b/linux-fetion/F-13/linux-fetion.spec
@@ -1,14 +1,14 @@
-Name:             linux-fetion
-Version:           1.3
-Release:           2%{?dist}
-Summary:       Fetion for linux
-
-Group:            Applications/Internet
-License:          GPLv2
-URL:                http://libfetion-gui.googlecode.com
-Source0:         http://libfetion-gui.googlecode.com/files/linux_fetion_v%{version}.tar.gz
+Name:           linux-fetion
+Version:        1.3
+Release:        3%{?dist}
+Summary:        Fetion for linux
+
+Group:          Applications/Internet
+License:        GPLv2
+URL:            http://code.google.com/p/libfetion-gui/
+Source0:        http://libfetion-gui.googlecode.com/files/linux_fetion_v%{version}.tar.gz
 # fix the desktop entry
-Patch0:         linux-fetion-desktop.patch
+Patch0:         linux-fetion-1.3-desktop.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel >= 4.5.0
@@ -28,14 +28,14 @@ which is based on libfetion library.
 %endif
 
 %build
-%_qt4_qmake
+%_qt4_qmake LIBS+=" -ldl"
 make  %{?_smp_mflags}
 
 
 %install
 rm -rf %{buildroot}
 
-install -Dm 0644 ./misc/fetion.png %{buildroot}%{_datadir}/pixmaps/fetion.png
+install -Dm 0644 ./misc/fetion.png %{buildroot}%{_datadir}/pixmaps/linux-fetion.png
 
 mkdir -p %{buildroot}%{_datadir}/libfetion/
 cp -rf resource skins %{buildroot}%{_datadir}/libfetion/
@@ -54,11 +54,15 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc README COPYING ChangeLog CREDITS.txt
 %{_bindir}/linux-fetion
-%{_datadir}/pixmaps/fetion.png
+%{_datadir}/pixmaps/linux-fetion.png
 %{_datadir}/libfetion/
 %{_datadir}/applications/LibFetion.desktop
 
 %changelog
+* Sun Jun 13 2010 Robin Lee <robinlee.sysu@gmail.com> - 1.3-3
+- change icon name
+- fix F-13 DSO linking problem
+
 * Mon Mar  8 2010 Cheese Lee <cheeselee@126.com> - 1.3-2
 - Many fixed
 
diff --git a/openfetion/F-13/openfetion-1.6.1-desktop.patch b/openfetion/F-13/openfetion-1.6.1-desktop.patch
new file mode 100644
index 0000000..1ef2b7e
--- /dev/null
+++ b/openfetion/F-13/openfetion-1.6.1-desktop.patch
@@ -0,0 +1,18 @@
+Index: resource/openfetion.desktop
+===================================================================
+--- resource/openfetion.desktop	(revision 37)
++++ resource/openfetion.desktop	(working copy)
+@@ -1,12 +1,11 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Name=OpenFetion
+ Name[en_GB]=OpenFetion
+ Name[zh_CN]=飞信(OpenFetion)
+ Comment=Fetion For Linux
+ Comment[zh_CN]=Linux版飞信客户端
+ Exec=openfetion
+-Icon=/usr/local/share/icons/fetion.jpg
++Icon=fetion
+ StartupNotify=true
+ Terminal=false
+ Type=Application
diff --git a/openfetion/F-13/openfetion.spec b/openfetion/F-13/openfetion.spec
index c092835..bca684e 100644
--- a/openfetion/F-13/openfetion.spec
+++ b/openfetion/F-13/openfetion.spec
@@ -1,42 +1,49 @@
-Name:		openfetion
-Version:	1.6.1
-Release:	1%{?dist}
-Summary:	Fetion GTK+ fronted, based on Fetion v4 protocal.
-
-Group:		Appications/Internet
-License:	GPLv2
-URL:		http://sourceforge.net/projects/ofetion/
-Source0:	%{name}-%{version}.tar.gz
+Name:       openfetion
+Version:    1.6.1
+Release:    2%{?dist}
+Summary:    A Fetion client written using GTK+ 2
+
+Group:      Applications/Internet
+License:    GPLv2+
+URL:        http://basiccoder.com/openfetion
+Source0:    http://sourceforge.net/projects/ofetion/files/%{name}-%{version}.tar.gz
+Patch0:     openfetion-1.6.1-desktop.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root
 
-BuildRequires:	libxml2-devel, openssl-devel, gtk2-devel
-Requires:	gtk2, libxml2, openssl
+BuildRequires:  libxml2-devel, openssl-devel, gtk2-devel, libnotify-devel
+BuildRequires:  gstreamer-devel
+# to make an acceptable icon
+BuildRequires:  ImageMagick
 
 %package devel
-Summary: Development files for openfetion
+Summary: Development files for Openfetion
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: libxml2-devel, openssl-devel, gtk2-devel
+Requires: libxml2-devel, openssl-devel, gtk2-devel, libnotify-devel
+Requires: gstreamer-devel
 
 %description
-Fetion GTK+ frontend app, based on Fetion v4 protocal.
+Openfetion is a Fetion client written using GTK+ 2, based on Fetion v4 protocol.
 
 %description devel
-This package contains libraries, header files and developer documentation 
-needed for developing software which uses the openfetion app.
+This package contains header files needed for developing software which uses
+Openfetion.
 
 %prep
 %setup -q
+%patch0 -p0
 
 
 %build
 %configure
 make %{?_smp_mflags}
+convert skin/fetion.jpg fetion.png
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+install -Dpm 644 fetion.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/fetion.png
 
 
 %clean
@@ -45,14 +52,21 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING INSTALL LICENSE NEWS README
+%doc AUTHORS ChangeLog COPYING LICENSE README
 %{_bindir}/*
-%{_datadir}/*
+%{_datadir}/%{name}/
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/pixmaps/fetion.png
 
 %files devel
+%defattr(-,root,root,-)
 %{_includedir}/*
 
 %changelog
+* Sun Jun 13 2010 Robin Lee <robinlee.sysu@gmail.com> - 1.6.1-2
+- Spec file massively renewed with reference to the one from Kunshan Wang
+  <wks1986@gmail.com>
+
 * Sat Jun 12 2010 Xuqing Kuang <xuqingkuang@gmail.com> - 1.6.1-1
 - Initial build.