--- a/ChangeLog Sun Mar 18 03:06:15 2007 -0400
+++ b/ChangeLog Sun Apr 01 17:11:21 2007 -0400
@@ -1,4 +1,5 @@
+ * Changed a ton of Gaim and gaim to Pidgin and pidgin, respectively Version 2.13beta6 1/19/07:
* Repackaged for Gaim 2.0.0beta6
--- a/Makefile.am Sun Mar 18 03:06:15 2007 -0400
+++ b/Makefile.am Sun Apr 01 17:11:21 2007 -0400
@@ -3,7 +3,7 @@
- gaim-guifications.spec \
+ pidgin-guifications.spec \ guifications-installer.nsi \
--- a/configure.ac Sun Mar 18 03:06:15 2007 -0400
+++ b/configure.ac Sun Apr 01 17:11:21 2007 -0400
@@ -1,6 +1,6 @@
-# Most of this configure script was ripped from gaim or the
-# gaim-encryption configure script, thanks guys ;)
+# Most of this configure script was ripped from pidgin or the +# pidgin-encryption configure script, thanks guys ;) AC_INIT([pidgin-guifications], [2.13mtn], [guifications-devel@lists.guifications.org])
@@ -28,7 +28,7 @@
# I'm lazy and figured config.h is the best place for this ;)
-AC_DEFINE_UNQUOTED(GF_WEBSITE, "http://gaim.guifications.org", [Guifications Website])
+AC_DEFINE_UNQUOTED(GF_WEBSITE, "http://pidgin.guifications.org", [Guifications Website]) @@ -79,7 +79,7 @@
PKG_CHECK_MODULES(PIDGIN, pidgin purple)
@@ -145,7 +145,7 @@
+ pidgin-guifications.spec nsis/translations/Makefile
--- a/gaim-guifications.spec.in Sun Mar 18 03:06:15 2007 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,93 +0,0 @@
-# gaim_major_ver and gaim_minor_ver should be defined to match the minimum
-# Gaim API version _required_ to build Guifications
-# Due to the way Gaim checks plugin versions, we need to also ensure that
-# the correct minimum version of Gaim is Require:'d based on what version of
-# the Gaim headers we actually build with.
-# This allows --define 'gaimver 1' to be used to build an rpm for Gaim 1.x
-# default is to build for Gaim 2.x
-%{!?gaimver: %{expand: %%define gaimver 2}}
-%define gaim_major_ver %{gaimver}
-%define gaim_minor_ver 0
-%define gaim_next_major_ver %(echo $((%{gaim_major_ver}+1)))
-%define gaim_build_minor_ver %(pkg-config --modversion gaim | awk -F. '{ print $2 }')
-Summary: Guifications Plugin for Gaim
-Release: 0%{?gaimdist:.%{gaimdist}}
-Group: Applications/Internet
-Url: http://gaim.guifications.org
-Source: http://downloads.guifications.org/gaim-plugins/Guifications2/%{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Requires: gaim >= 1:%{gaim_major_ver}.%{gaim_build_minor_ver}, gaim < 1:%{gaim_next_major_ver}
-BuildRequires: pkgconfig, libtool, gettext
-BuildRequires: gaim-devel >= 1:%{gaim_major_ver}.%{gaim_minor_ver}, gaim-devel < 1:%{gaim_next_major_ver}
-%if "%{_vendor}" == "MandrakeSoft"
-BuildRequires: libgtk+2.0_0-devel
-BuildRequires: gtk2-devel
-Guifications is a graphical notification plugin for the open source instant messaging client Gaim
-To rebuild for a specific Gaim version:
-rpmbuild --rebuild %{name}-%{version}-%{release}.src.rpm --define 'gaimdist %{!?gaimdist:fc1}%{?gaimdist:%{gaimdist}}'
-make DESTDIR="$RPM_BUILD_ROOT" install
-%if "%{_vendor}" == "MandrakeSoft"
-mv -f $RPM_BUILD_ROOT%{_libdir}/gaim/guifications $RPM_BUILD_ROOT%{_libdir}/gaim/guifications.so || :
-strip $RPM_BUILD_ROOT%{_libdir}/gaim/*.so || :
-rm -f $RPM_BUILD_ROOT%{_libdir}/gaim/*.la $RPM_BUILD_ROOT%{_libdir}/gaim/*.a
-%files -f guifications.lang
-%doc AUTHORS ChangeLog COPYING README doc/flow.png doc/flow.dia doc/QUOTES
-%{_datadir}/pixmaps/gaim/guifications
-* Tue Dec 5 2006 John Bailey <rekkanoryo@rekkanoryo.org>
-- Fix the source URL to point to our new download location
-* Thu Oct 19 2006 Stu Tomlinson <stu@nosnilmot.com>
-- Fix finding the translations
-* Thu Nov 3 2005 Stu Tomlinson <stu@nosnilmot.com>
-- Default to building for Gaim 2.x with a bit of trickery to optionally
-* Fri Apr 8 2005 Stu Tomlinson <stu@nosnilmot.com>
-- spec file cleanup, build vs. install dependency fixes, use %%find_lang,
- tidy up release version, fix directory ownership
-* Fri Dec 17 2004 Stu Tomlinson <stu@nosnilmot.com>
-- Tweaks to the Gaim version dependencies
-* Sat Oct 9 2004 Stu Tomlinson <stu@nosnilmot.com>
-- Add Gaim version checks to match new Gaim versioning
-* Wed Jun 30 2004 Stu Tomlinson <stu@nosnilmot.com>
-- Initial spec file for Guifications 2
--- a/gf_config.h.mingw Sun Mar 18 03:06:15 2007 -0400
+++ b/gf_config.h.mingw Sun Apr 01 17:11:21 2007 -0400
@@ -22,7 +22,7 @@
/* Guifications Website */
-#define GF_WEBSITE "http://gaim.guifications.org"
+#define GF_WEBSITE "http://pidgin.guifications.org" /* Define to 1 if you have `alloca', as a function or macro. */
@@ -67,8 +67,8 @@
/* Define to 1 if you have the `fwprintf' function. */
-/* Define if we've found gaim. */
+/* Define if we've found pidgin. */ /* Define to 1 if you have the `getcwd' function. */
--- a/guifications-installer.nsi Sun Mar 18 03:06:15 2007 -0400
+++ b/guifications-installer.nsi Sun Apr 01 17:11:21 2007 -0400
@@ -1,6 +1,6 @@
; NSIS Script For Guifications Plugin
; Author Daniel A. Atallah
-; Based on the Gaim installer by Herman Bloggs and the Gaim-Encryption installer by Bill Tompkins
+; Based on the Pidgin installer by Herman Bloggs and the Pidgin-Encryption installer by Bill Tompkins ;--------------------------------
@@ -9,36 +9,36 @@
;--------------------------------
- Name "Gaim Guifications ${GUIFICATIONS_VERSION}"
+ Name "Pidgin Guifications ${GUIFICATIONS_VERSION}" - OutFile "gaim-guifications-${GUIFICATIONS_VERSION}.exe"
+ OutFile "pidgin-guifications-${GUIFICATIONS_VERSION}.exe" ;The Default Installation Directory
- InstallDir "$PROGRAMFILES\gaim"
- InstallDirRegKey HKLM SOFTWARE\gaim ""
+ InstallDir "$PROGRAMFILES\pidgin" + InstallDirRegKey HKLM SOFTWARE\pidgin "" SetCompressor /SOLID lzma
- !define GUIFICATIONS_UNINST_EXE "gaim-guifications-uninst.exe"
+ !define GUIFICATIONS_UNINST_EXE "pidgin-guifications-uninst.exe" !define GUIFICATIONS_DLL "guifications.dll"
!define GUIFICATIONS_UNINSTALL_LNK "Guifications Uninstall.lnk"
;--------------------------------
- !define GUIFICATIONS_REG_KEY "SOFTWARE\gaim-guifications"
- !define GUIFICATIONS_UNINSTALL_KEY "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\gaim-guifications"
+ !define GUIFICATIONS_REG_KEY "SOFTWARE\pidgin-guifications" + !define GUIFICATIONS_UNINSTALL_KEY "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\pidgin-guifications" ;-------------------------------
-; Gaim Plugin installer helper stuff
+; Pidgin Plugin installer helper stuff !addincludedir "../../win32/nsis"
- !include "gaim-plugin.nsh"
+ !include "pidgin-plugin.nsh" ;--------------------------------
; Modern UI Configuration
@@ -46,7 +46,7 @@
!define MUI_UNICON .\nsis\install.ico
!define MUI_HEADERIMAGE_BITMAP "nsis\header.bmp"
- !define MUI_CUSTOMFUNCTION_GUIINIT gf_checkGaimVersion
+ !define MUI_CUSTOMFUNCTION_GUIINIT gf_checkPidginVersion @@ -147,7 +147,7 @@
Delete "$R1\plugins\${GUIFICATIONS_DLL}"
- RMDir /r "$R1\pixmaps\gaim\guifications"
+ RMDir /r "$R1\pixmaps\pidgin\guifications" @@ -191,16 +191,16 @@
File "src\${GUIFICATIONS_DLL}"
- SetOutPath "$INSTDIR\pixmaps\gaim\guifications\conf"
+ SetOutPath "$INSTDIR\pixmaps\pidgin\guifications\conf" - SetOutPath "$INSTDIR\pixmaps\gaim\guifications\themes\default"
+ SetOutPath "$INSTDIR\pixmaps\pidgin\guifications\themes\default" File "themes\default\theme.xml"
File "themes\default\background.png"
- SetOutPath "$INSTDIR\pixmaps\gaim\guifications\themes\mini"
+ SetOutPath "$INSTDIR\pixmaps\pidgin\guifications\themes\mini" File "themes\mini\theme.xml"
File "themes\mini\background.png"
- SetOutPath "$INSTDIR\pixmaps\gaim\guifications\themes\Penguins"
+ SetOutPath "$INSTDIR\pixmaps\pidgin\guifications\themes\Penguins" File "themes\Penguins\theme.xml"
File "themes\Penguins\penguin.png"
@@ -237,7 +237,7 @@
File /oname=guifications.mo po\zh_TW.gmo
- CreateShortCut "$SMPROGRAMS\Gaim\${GUIFICATIONS_UNINSTALL_LNK}" "$INSTDIR\${GUIFICATIONS_UNINST_EXE}"
+ CreateShortCut "$SMPROGRAMS\Pidgin\${GUIFICATIONS_UNINSTALL_LNK}" "$INSTDIR\${GUIFICATIONS_UNINST_EXE}" WriteUninstaller "$INSTDIR\${GUIFICATIONS_UNINST_EXE}"
@@ -271,7 +271,7 @@
Delete "$INSTDIR\plugins\${GUIFICATIONS_DLL}"
- RMDir /r "$INSTDIR\pixmaps\gaim\guifications"
+ RMDir /r "$INSTDIR\pixmaps\pidgin\guifications" ; loop through locale dirs and try to delete any guifications translations
@@ -299,12 +299,12 @@
Delete "$INSTDIR\${GUIFICATIONS_UNINST_EXE}"
- Delete "$SMPROGRAMS\Gaim\${GUIFICATIONS_UNINSTALL_LNK}"
+ Delete "$SMPROGRAMS\Pidgin\${GUIFICATIONS_UNINSTALL_LNK}" - ; try to delete the Gaim directories, in case it has already uninstalled
+ ; try to delete the Pidgin directories, in case it has already uninstalled - RMDir "$SMPROGRAMS\Gaim"
+ RMDir "$SMPROGRAMS\Pidgin" @@ -319,23 +319,23 @@
-; Check that the selected installation dir contains gaim.exe
+; Check that the selected installation dir contains pidgin.exe Function .onVerifyInstDir
- IfFileExists $INSTDIR\gaim.exe +2
+ IfFileExists $INSTDIR\pidgin.exe +2 -; Check that the currently installed gaim version is compatible with the version of guifications we are installing
-Function gf_checkGaimVersion
+; Check that the currently installed pidgin version is compatible with the version of guifications we are installing +Function gf_checkPidginVersion
+ Call CheckPidginVersion - StrCmp $R0 ${GAIM_VERSION_OK} gf_checkGaimVersion_OK
+ StrCmp $R0 ${GAIM_VERSION_OK} gf_checkPidginVersion_OK StrCmp $R0 ${GAIM_VERSION_INCOMPATIBLE} +1 +6
MessageBox MB_OK|MB_ICONSTOP "$(BAD_GAIM_VERSION_1) $R0 $(BAD_GAIM_VERSION_2)"
@@ -343,7 +343,7 @@
MessageBox MB_OK|MB_ICONSTOP "$(NO_GAIM_VERSION)"
- gf_checkGaimVersion_OK:
+ gf_checkPidginVersion_OK: --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/pidgin-guifications.spec.in Sun Apr 01 17:11:21 2007 -0400
@@ -0,0 +1,97 @@
+# pidgin_major_ver and pidgin_minor_ver should be defined to match the minimum +# Pidgin API version _required_ to build Guifications +# Due to the way Pidgin checks plugin versions, we need to also ensure that +# the correct minimum version of Pidgin is Require:'d based on what version of +# the Pidgin headers we actually build with. +# This allows --define 'pidginver 1' to be used to build an rpm for Pidgin 1.x +# default is to build for Pidgin 2.x +%{!?pidginver: %{expand: %%define pidginver 2}} +%define pidgin_major_ver %{pidginver} +%define pidgin_minor_ver 0 +%define pidgin_next_major_ver %(echo $((%{pidgin_major_ver}+1))) +%define pidgin_build_minor_ver %(pkg-config --modversion pidgin | awk -F. '{ print $2 }') +Summary: Guifications Plugin for Pidgin +Release: 0%{?pidgindist:.%{pidgindist}} +Group: Applications/Internet +Url: http://pidgin.guifications.org +Source: http://downloads.guifications.org/pidgin-plugins/Guifications2/%{name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Requires: pidgin >= 1:%{pidgin_major_ver}.%{pidgin_build_minor_ver}, pidgin < 1:%{pidgin_next_major_ver} +BuildRequires: pkgconfig, libtool, gettext +BuildRequires: pidgin-devel >= 1:%{pidgin_major_ver}.%{pidgin_minor_ver}, pidgin-devel < 1:%{pidgin_next_major_ver} +%if "%{_vendor}" == "MandrakeSoft" +BuildRequires: libgtk+2.0_0-devel +BuildRequires: gtk2-devel +Guifications is a graphical notification plugin for the open source instant messaging client Pidgin +To rebuild for a specific Pidgin version: +rpmbuild --rebuild %{name}-%{version}-%{release}.src.rpm --define 'pidgindist %{!?pidgindist:fc1}%{?pidgindist:%{pidgindist}}' +make DESTDIR="$RPM_BUILD_ROOT" install +%if "%{_vendor}" == "MandrakeSoft" +mv -f $RPM_BUILD_ROOT%{_libdir}/pidgin/guifications $RPM_BUILD_ROOT%{_libdir}/pidgin/guifications.so || : +strip $RPM_BUILD_ROOT%{_libdir}/pidgin/*.so || : +rm -f $RPM_BUILD_ROOT%{_libdir}/pidgin/*.la $RPM_BUILD_ROOT%{_libdir}/pidgin/*.a +%files -f guifications.lang +%doc AUTHORS ChangeLog COPYING README doc/flow.png doc/flow.dia doc/QUOTES +%{_datadir}/pixmaps/pidgin/guifications +- :%s/gaim/pidgin/g and :%s/Gaim/Pidgin/g to prep for eventual Pidgin +* Tue Dec 5 2006 John Bailey <rekkanoryo@rekkanoryo.org> +- Fix the source URL to point to our new download location +* Thu Oct 19 2006 Stu Tomlinson <stu@nosnilmot.com> +- Fix finding the translations +* Thu Nov 3 2005 Stu Tomlinson <stu@nosnilmot.com> +- Default to building for Pidgin 2.x with a bit of trickery to optionally +* Fri Apr 8 2005 Stu Tomlinson <stu@nosnilmot.com> +- spec file cleanup, build vs. install dependency fixes, use %%find_lang, + tidy up release version, fix directory ownership +* Fri Dec 17 2004 Stu Tomlinson <stu@nosnilmot.com> +- Tweaks to the Pidgin version dependencies +* Sat Oct 9 2004 Stu Tomlinson <stu@nosnilmot.com> +- Add Pidgin version checks to match new Pidgin versioning +* Wed Jun 30 2004 Stu Tomlinson <stu@nosnilmot.com> +- Initial spec file for Guifications 2