[pcmanx-gtk2/f15] Update to 1.0

Thu Jan 12 12:22:45 UTC 2012

commit e4b4c45260272af11dcb637c7f421eeb1769602e
Author: Robin Lee <cheeselee at fedoraproject.org>
Date:   Thu Jan 12 20:22:20 2012 +0800

    Update to 1.0

 .gitignore                            |    1 +
 pcmanx-gtk2-0.3.9-Fedora-idldir.patch |   11 ----
 pcmanx-gtk2-0.3.9-Fedora-xpidl.patch  |   11 ----
 pcmanx-gtk2-0.3.9-libnotify.patch     |   11 ----
 pcmanx-gtk2.spec                      |   95 +++++----------------------------
 pcmanx.desktop                        |    2 +-
 sources                               |    2 +-
 7 files changed, 17 insertions(+), 116 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index b4b69d0..65ae67a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /pcmanx-gtk2-20101026.tar.bz2
+/pcmanx-gtk2-1.0.tar.bz2
diff --git a/pcmanx-gtk2.spec b/pcmanx-gtk2.spec
index 77a1443..c4c6424 100644
--- a/pcmanx-gtk2.spec
+++ b/pcmanx-gtk2.spec
@@ -1,39 +1,17 @@
-# Update as needed for newer xulrunner
-# We hardcode this here because everytime xulrunner increments
-# it tends to break things that depend on it.
-%define xulver 1.9.2.3
-%define svndate 20101026
-%define svnver 529
-
 Summary:	Telnet client designed for BBS browsing
 Name:		pcmanx-gtk2
-Version:	0.3.9
-Release:	8.%{?svndate}svn%{?dist}
+Version:	1.0
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
-#Source0:   http://pcmanx-gtk2.googlecode.com/svn/website/release/%{name}-%{version}.tar.bz2
-
-# The source for this package was pulled from upstream's vcs.  Use the
-# following commands to generate the tarball:
-#  svn export -r %{svnver} http://pcmanx-gtk2.googlecode.com/svn/trunk/ pcmanx-gtk2-%{svndate}
-#  tar -cjvf pcmanx-gtk2-%{svndate}.tar.bz2 pcmanx-gtk2-%{svndate}
-Source0:	%{name}-%{svndate}.tar.bz2
+Source0:    http://pcmanx-gtk2.googlecode.com/files/%{name}-%{version}.tar.bz2
 Source1:	pcmanx.desktop
-# Detect xpidl on Fedora (and set MOZILLA_LIB_ROOT properly)
-Patch0:		%{name}-0.3.9-Fedora-xpidl.patch
-# The idldir in our libxul already has "stable" in it.
-Patch1:		%{name}-0.3.9-Fedora-idldir.patch
-# Fix building with libnotify 0.7.0
-Patch2:		%{name}-0.3.9-libnotify.patch
 URL:		http://code.google.com/p/pcmanx-gtk2/
 BuildRequires:	gtk2-devel libXft-devel
 BuildRequires:	libnotify-devel >= 0.7.0
 BuildRequires:	desktop-file-utils gettext
-# required for generating configure script
-BuildRequires:	libtool intltool
-# plugin (disable by default, can't work on gecko 1.9.2 temporarily) 
-%{?_with_plugin:BuildRequires:	xulrunner-devel}
-%{!?_with_plugin:Obsoletes:	pcmanx-gtk2-xulrunner-plugin < %{version}-%{release}}
+BuildRequires:	intltool
+
 
 %description
 An easy-to-use telnet client mainly targets BBS users.
@@ -43,37 +21,13 @@ famous BBS client formerly designed for MS Windows only.  It aimed to
 be an easy-to-use yet full-featured telnet client facilitating BBS
 browsing with the ability to process double-byte characters.
 
-%{?_with_plugin:
-%package xulrunner-plugin
-Summary:	Mozilla/Firefox/XULRunner telnet plugin using PCManX
-Requires:	%{name} = %{version}-%{release}
-Requires:	xulrunner = %{xulver}
-Group:		Applications/Internet
-License:	MPLv1.1 or GPLv2+ or LGPLv2+
-
-%description xulrunner-plugin
-Mozilla/Firefox/XULRunner plugin for PCManX. This plugin adds support for 
-telnet:// protocol to your Mozilla based browser. The protocol engine is 
-done by PCManX and the output window is embedded in a webpage in the browser 
-window. 
-}
 
 %prep
-%setup -q -n %{name}-%{svndate}
-%patch0 -p1 -b .xpidl
-%patch1 -p1 -b .idldir
-%patch2 -p1 -b .libnotify
+%setup -q
 
-sed -i '/INCLUDES = \\/a \ \ -I\/usr\/include\/nspr4 \\' plugin/src/Makefile.am
 
 %build
-./autogen.sh
-%configure --disable-shared \
-	--enable-libnotify \
-	--enable-wget \
-	--enable-iplookup \
-%{?_with_plugin:--enable-plugin} \
-	--enable-proxy
+%configure --enable-proxy --enable-libnotify --enable-iplookup --enable-wget
 make %{?_smp_mflags}
 
 %install
@@ -84,44 +38,23 @@ desktop-file-install \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   %{SOURCE1}
 
-#remove .la .so files
-rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la
-rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.so
-rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.a
-
-%{?_with_plugin:
-# Set the plugin +x so we can get debuginfo from it.
-chmod +x $RPM_BUILD_ROOT%{_libdir}/xulrunner-*/plugins/*.so
-
-# Make a symlink so firefox sees the plugin.
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins/
-cd $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins/
-ln -s ../../xulrunner-*/plugins/pcmanx-plugin.so pcmanx-plugin.so
-}
-
 %find_lang pcmanx
 
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 %files -f pcmanx.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS TODO
-%dir %{_datadir}/pcmanx
+%doc AUTHORS ChangeLog COPYING NEWS README TODO
 %{_bindir}/*
 %{_datadir}/applications/*
-%{_datadir}/pcmanx/*
+%{_datadir}/pcmanx/
 %{_datadir}/pixmaps/*.png
+%{_mandir}/man1/pcmanx.1*
 
-%{?_with_plugin:
-%files xulrunner-plugin
-%defattr(-,root,root,-)
-%{_libdir}/xulrunner-*/components/*
-%{_libdir}/xulrunner-*/plugins/pcmanx-plugin.so
-%{_libdir}/mozilla/plugins/*.so*
-}
 
 %changelog
+* Thu Jan 12 2012 Robin Lee <cheeselee at fedoraproject.org> - 1.0-1
+- Update to 1.0
+- Specfile cleanup
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.9-8.20101026svn
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/pcmanx.desktop b/pcmanx.desktop
index 0d2d38c..706011e 100644
--- a/pcmanx.desktop
+++ b/pcmanx.desktop
@@ -3,7 +3,7 @@ Name=PCManX
 Exec=pcmanx
 Icon=pcmanx
 Type=Application
-Categories=Network;RemoteAccess
+Categories=Network;RemoteAccess;
 Terminal=false
 GenericName=BBS Client
 GenericName[zh_TW]=BBS 連線軟體
diff --git a/sources b/sources
index 7c06a61..da12246 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-19a1757794c034ac80e7b756cbf06df8  pcmanx-gtk2-20101026.tar.bz2
+b2fe19a69e34a832a51319f44ec29539  pcmanx-gtk2-1.0.tar.bz2
