rpms/pcmanx-gtk2/F-12 Makefile, 1.2, 1.3 pcmanx-gtk2-0.3.9-Fedora-idldir.patch, NONE, 1.1 pcmanx-gtk2-0.3.9-Fedora-xpidl.patch, NONE, 1.1 pcmanx-gtk2.spec, 1.15, 1.16 pcmanx.desktop, 1.2, 1.3 sources, 1.5, 1.6 .cvsignore, 1.3, NONE dead.package, 1.1, NONE

supercyper supercyper at fedoraproject.org
Sat Jun 19 02:22:29 UTC 2010


Author: supercyper

Update of /cvs/pkgs/rpms/pcmanx-gtk2/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv28699

Added Files:
	Makefile pcmanx-gtk2-0.3.9-Fedora-idldir.patch 
	pcmanx-gtk2-0.3.9-Fedora-xpidl.patch pcmanx-gtk2.spec 
	pcmanx.desktop sources 
Removed Files:
	.cvsignore dead.package 
Log Message:



Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	19 Jun 2010 02:22:29 -0000	1.3
@@ -0,0 +1,21 @@
+# Makefile for source rpm: pcmanx-gtk2
+# $Id$
+NAME := pcmanx-gtk2
+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 $$d/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)

pcmanx-gtk2-0.3.9-Fedora-idldir.patch:
 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE pcmanx-gtk2-0.3.9-Fedora-idldir.patch ---
--- pcmanx-gtk2-20100326/configure.ac.idldir	2010-03-26 21:34:01.930579770 +0800
+++ pcmanx-gtk2-20100326/configure.ac	2010-03-26 21:34:21.081579698 +0800
@@ -509,7 +509,7 @@
 esac
 
       MOZILLA_LIB_DIR_SEARCH="$MOZILLA_LIB_ROOT"
-      MOZILLA_IDLDIR=`$PKG_CONFIG --variable=idldir libxul`/`$PKG_CONFIG --variable=includetype libxul`
+      MOZILLA_IDLDIR=`$PKG_CONFIG --variable=idldir libxul`
     else
       dnl Note: with the infos from mozilla-plugin.pc
       dnl we got all includes and libraries for the C interface

pcmanx-gtk2-0.3.9-Fedora-xpidl.patch:
 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE pcmanx-gtk2-0.3.9-Fedora-xpidl.patch ---
--- pcmanx-gtk2-20100326/configure.ac.xpidl	2010-03-26 21:26:53.267579032 +0800
+++ pcmanx-gtk2-20100326/configure.ac	2010-03-26 21:30:47.962578815 +0800
@@ -505,7 +505,7 @@
             MOZILLA_LIB_ROOT=`$PKG_CONFIG --variable=libdir $gecko_provider-plugin`
            ;;
           *)
-            MOZILLA_LIB_ROOT=`$PKG_CONFIG --variable=sdkdir $gecko_provider-plugin`/bin
+            MOZILLA_LIB_ROOT=`$PKG_CONFIG --variable=libdir libxul`
 esac
 
       MOZILLA_LIB_DIR_SEARCH="$MOZILLA_LIB_ROOT"


Index: pcmanx-gtk2.spec
===================================================================
RCS file: pcmanx-gtk2.spec
diff -N pcmanx-gtk2.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ pcmanx-gtk2.spec	19 Jun 2010 02:22:29 -0000	1.16
@@ -0,0 +1,179 @@
+# 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 20100618
+%define svnver 525
+
+Summary:	Telnet client designed for BBS browsing
+Name:		pcmanx-gtk2
+Version:	0.3.9
+Release:	6.%{?svndate}svn%{?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
+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
+URL:		http://code.google.com/p/pcmanx-gtk2/
+BuildRequires:	gtk2-devel libnotify-devel libXft-devel
+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}}
+
+%description
+An easy-to-use telnet client mainly targets BBS users.
+
+PCMan X is a newly developed GPL'd version of PCMan, a full-featured
+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
+
+sed -i '/INCLUDES = \\/a \ \ -I\/usr\/include\/nspr4 \\' plugin/src/Makefile.am
+
+%build
+./autogen.sh
+%configure --enable-libnotify \
+	--enable-wget \
+	--enable-iplookup \
+%{?_with_plugin:--enable-plugin} \
+	-enable-proxy
+make %{?_smp_mflags}
+
+%install
+make install INSTALL="install -c -p" DESTDIR=$RPM_BUILD_ROOT
+
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+desktop-file-install \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+  %{SOURCE1}
+
+%find_lang pcmanx
+
+#remove .la .so files
+rm $RPM_BUILD_ROOT/%{_libdir}/*.la
+rm $RPM_BUILD_ROOT/%{_libdir}/*.so
+
+%{?_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
+}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files -f pcmanx.lang
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS TODO
+%dir %{_datadir}/pcmanx
+%{_bindir}/*
+%{_libdir}/libpcmanx*
+%{_datadir}/applications/*
+%{_datadir}/pcmanx/*
+%{_datadir}/pixmaps/*.png
+
+%{?_with_plugin:
+%files xulrunner-plugin
+%defattr(-,root,root,-)
+%{_libdir}/xulrunner-*/components/*
+%{_libdir}/xulrunner-*/plugins/pcmanx-plugin.so
+%{_libdir}/mozilla/plugins/*.so*
+}
+
+%changelog
+* Fri Jun 18 2010 Chen Lei <supercyper at 163.com> - 0.3.9-6.20100618svn
+- several changes according to the review
+- disable plugin by default
+- svn 525
+
+* Tue Jun 01 2010 Chen Lei <supercyper at 163.com> - 0.3.9-5.20100601svn
+- svn 523
+
+* Sat Mar 27 2010 Chen Lei <supercyper at 163.com> - 0.3.9-4.20100326svn
+- svn 514
+- remove obsolete patches
+
+* Mon Feb 22 2010 Chen Lei <supercyper at 163.com> - 0.3.9-3.20100222svn
+- svn 501
+- resolves: #513527
+
+* Thu Feb 18 2010 <jhorak at redhat.com> - 0.3.9-2.20100210svn
+- Rebuild against newer gecko
+
+* Wed Feb 10 2010 Chen Lei <supercyper at 163.com> - 0.3.9-1.20100210svn
+- svn 500
+- remove obsolete patches
+
+* Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 0.3.8-11
+- Rebuild against newer gecko
+
+* Thu Nov 05 2009 Jan Horak <jhorak at redhat.com> - 0.3.8-10
+- Rebuild against newer gecko
+
+* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 0.3.8-9
+- Rebuild against newer gecko
+
+* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 0.3.8-8
+- Rebuild against newer gecko
+
+* Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 0.3.8-7
+- Rebuild against newer gecko
+
+* Thu Jul 23 2009 Jan Horak <jhorak at redhat.com> - 0.3.8-6
+- Rebuild against newer gecko
+
+* Wed Mar 5 2009 Caolán McNamara <caolanm at redhat.com> 0.3.8-5
+- include stdio.h for perror
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.8-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Wed Jan 7 2009 Martin Stransky <stransky at redhat.com> - 0.3.8-3
+- updated for xulrunner 1.9.1
+
+* Thu Sep 25 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.3.8-2
+- rebuild against xulrunner 1.9.0.2
+
+* Wed Aug 27 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.3.8-1
+- update to 0.3.8
+- build and package mozilla/firefox/xulrunner plugin


Index: pcmanx.desktop
===================================================================
RCS file: pcmanx.desktop
diff -N pcmanx.desktop
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ pcmanx.desktop	19 Jun 2010 02:22:29 -0000	1.3
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=PCManX
+Exec=pcmanx
+Icon=pcmanx
+Type=Application
+Categories=Network;RemoteAccess
+Terminal=false
+GenericName=BBS Client
+GenericName[zh_TW]=BBS 連線軟體
+GenericName[zh_CN]=BBS 连线软件
+StartupNotify=true


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	19 Jun 2010 02:22:29 -0000	1.6
@@ -0,0 +1 @@
+39ed4f8bf8423857f20f798d5f91e4d1  pcmanx-gtk2-20100618.tar.bz2


--- .cvsignore DELETED ---


--- dead.package DELETED ---



More information about the scm-commits mailing list