SPECS: seamonkey.spec, mozilla-firefox.spec, kazehakase.spec, galeon.spec, ...

hawk hawk at pld-linux.org
Sat May 24 21:03:25 CEST 2008


Author: hawk                         Date: Sat May 24 19:03:25 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %pld_release macro and apply proper agent patch, BR: rpm >= 4.4.9-56

---- Files affected:
SPECS:
   seamonkey.spec (1.83 -> 1.84) , mozilla-firefox.spec (1.236 -> 1.237) , kazehakase.spec (1.66 -> 1.67) , galeon.spec (1.282 -> 1.283) , epiphany.spec (1.183 -> 1.184) , kdelibs.spec (1.563 -> 1.564) 

---- Diffs:

================================================================
Index: SPECS/seamonkey.spec
diff -u SPECS/seamonkey.spec:1.83 SPECS/seamonkey.spec:1.84
--- SPECS/seamonkey.spec:1.83	Sun Mar 30 14:32:50 2008
+++ SPECS/seamonkey.spec	Sat May 24 21:03:18 2008
@@ -33,7 +33,8 @@
 Patch2:		%{name}-kill_slim_hidden_def.patch
 Patch3:		%{name}-lib_path.patch
 Patch4:		%{name}-fonts.patch
-Patch5:		%{name}-agent.patch
+Patch5:		%{name}-ti-agent.patch
+Patch6:		%{name}-agent.patch
 URL:		http://www.seamonkey-project.org/
 BuildRequires:	automake
 %{?with_svg:BuildRequires:	cairo-devel >= 1.0.0}
@@ -49,6 +50,7 @@
 BuildRequires:	nss-devel >= 1:3.11.3
 BuildRequires:	perl-modules >= 5.6.0
 BuildRequires:	pkgconfig
+BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(macros) >= 1.356
 BuildRequires:	sed >= 4.0
 BuildRequires:	xorg-lib-libXext-devel
@@ -213,7 +215,11 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%if "%{pld_release}" == "ti"
 %patch5 -p1
+%else
+%patch6 -p1
+%endif
 
 %build
 cd mozilla
@@ -749,6 +755,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.84  2008-05-24 19:03:18  hawk
+- use %pld_release macro and apply proper agent patch, BR: rpm >= 4.4.9-56
+
 Revision 1.83  2008-03-30 12:32:50  glen
 - release 2 (1 for ac)
 

================================================================
Index: SPECS/mozilla-firefox.spec
diff -u SPECS/mozilla-firefox.spec:1.236 SPECS/mozilla-firefox.spec:1.237
--- SPECS/mozilla-firefox.spec:1.236	Thu Apr 24 08:25:35 2008
+++ SPECS/mozilla-firefox.spec	Sat May 24 21:03:18 2008
@@ -31,15 +31,16 @@
 Patch0:		mozilla-install.patch
 Patch1:		%{name}-lib_path.patch
 Patch2:		%{name}-fonts.patch
-Patch3:		%{name}-agent.patch
-Patch4:		%{name}-myspell.patch
-Patch5:		%{name}-pango-cursor-position.patch
-Patch6:		%{name}-pango-ligatures.patch
-Patch7:		%{name}-pango-cursor-position-more.patch
-Patch8:		%{name}-pango-justified-range.patch
-Patch9:		%{name}-pango-printing.patch
-Patch10:	%{name}-pango-underline.patch
-Patch11:	%{name}-xft-randewidth.patch
+Patch3:		%{name}-myspell.patch
+Patch4:		%{name}-pango-cursor-position.patch
+Patch5:		%{name}-pango-ligatures.patch
+Patch6:		%{name}-pango-cursor-position-more.patch
+Patch7:		%{name}-pango-justified-range.patch
+Patch8:		%{name}-pango-printing.patch
+Patch9:		%{name}-pango-underline.patch
+Patch10:	%{name}-xft-randewidth.patch
+Patch11:	%{name}-ti-agent.patch
+Patch12:	%{name}-agent.patch
 # if ac rebuild is needed...
 #PatchX:		%{name}-ac.patch
 URL:		http://www.mozilla.org/projects/firefox/
@@ -61,6 +62,7 @@
 BuildRequires:	pango-devel >= 1:1.6.0
 BuildRequires:	perl-modules >= 5.004
 BuildRequires:	pkgconfig
+BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(macros) >= 1.356
 BuildRequires:	xorg-lib-libXext-devel
 BuildRequires:	xorg-lib-libXft-devel >= 2.1
@@ -109,10 +111,14 @@
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
-%patch9 -p0
+%patch8 -p0
+%patch9 -p1
 %patch10 -p1
+%if "%{pld_release}" == "ti"
 %patch11 -p1
+%else
+%patch12 -p1
+%endif
 
 %build
 cd mozilla
@@ -585,6 +591,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.237  2008-05-24 19:03:18  hawk
+- use %pld_release macro and apply proper agent patch, BR: rpm >= 4.4.9-56
+
 Revision 1.236  2008-04-24 06:25:35  hawk
 - release 2
 

================================================================
Index: SPECS/kazehakase.spec
diff -u SPECS/kazehakase.spec:1.66 SPECS/kazehakase.spec:1.67
--- SPECS/kazehakase.spec:1.66	Sat Apr 26 23:42:09 2008
+++ SPECS/kazehakase.spec	Sat May 24 21:03:18 2008
@@ -14,8 +14,9 @@
 Source0:	http://downloads.sourceforge.jp/kazehakase/30219/%{name}-%{version}.tar.gz
 # Source0-md5:	75f8afb9ddf4493c3a1fb4eb38a044df
 Patch0:		%{name}-desktop.patch
-Patch1:		%{name}-agent.patch
-Patch2:		%{name}-deprecated.patch
+Patch1:		%{name}-deprecated.patch
+Patch2:		%{name}-ti-agent.patch
+Patch3:		%{name}-agent.patch
 URL:		http://kazehakase.sourceforge.jp/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -26,6 +27,7 @@
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
+BuildRequires:	rpm >= 4.4.9-56
 %{?with_gecko:BuildRequires:	xulrunner-devel}
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	kazehakase_engine
@@ -84,7 +86,11 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%if "%{pld_release}" == "ti"
 %patch2 -p1
+%else
+%patch3 -p1
+%endif
 
 %build
 %{__libtoolize}
@@ -150,6 +156,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.67  2008-05-24 19:03:18  hawk
+- use %pld_release macro and apply proper agent patch, BR: rpm >= 4.4.9-56
+
 Revision 1.66  2008-04-26 21:42:09  megabajt
 - release 5
 

================================================================
Index: SPECS/galeon.spec
diff -u SPECS/galeon.spec:1.282 SPECS/galeon.spec:1.283
--- SPECS/galeon.spec:1.282	Sat Apr 26 23:39:08 2008
+++ SPECS/galeon.spec	Sat May 24 21:03:18 2008
@@ -24,8 +24,9 @@
 Patch0:		%{name}-desktop.patch
 Patch1:		%{name}-home_etc.patch
 Patch2:		%{name}-mozilla.patch
-Patch3:		%{name}-agent.patch
-Patch4:		%{name}-build_fix.patch
+Patch3:		%{name}-build_fix.patch
+Patch4:		%{name}-ti-agent.patch
+Patch5:		%{name}-agent.patch
 URL:		http://galeon.sourceforge.net/
 BuildRequires:	GConf2-devel >= 2.4.0
 BuildRequires:	ORBit2-devel >= 2.8.3
@@ -47,6 +48,7 @@
 BuildRequires:	xulrunner-devel >= 1.8.0.4
 %{?with_nautilus:BuildRequires:	nautilus-devel >= 2.4.0}
 BuildRequires:	pkgconfig
+BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(find_lang) >= 1.23
 BuildRequires:	rpmbuild(macros) >= 1.197
 BuildRequires:	scrollkeeper >= 0.1.4
@@ -89,7 +91,11 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%if "%{pld_release}" == "ti"
 %patch4 -p1
+%else
+%patch5 -p1
+%endif
 
 sed -i -e 's#sr\@Latn#sr\@latin#' configure.in
 mv po/sr\@{Latn,latin}.po
@@ -167,6 +173,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.283  2008-05-24 19:03:18  hawk
+- use %pld_release macro and apply proper agent patch, BR: rpm >= 4.4.9-56
+
 Revision 1.282  2008-04-26 21:39:08  megabajt
 - release 4
 

================================================================
Index: SPECS/epiphany.spec
diff -u SPECS/epiphany.spec:1.183 SPECS/epiphany.spec:1.184
--- SPECS/epiphany.spec:1.183	Sat Apr 26 23:31:07 2008
+++ SPECS/epiphany.spec	Sat May 24 21:03:18 2008
@@ -16,7 +16,8 @@
 # Source0-md5:	24bb8c430a6165b9c43a2ed0452cc6a5
 Patch0:		%{name}-pld-homepage.patch
 Patch1:		%{name}-configure.patch
-Patch2:		%{name}-agent.patch
+Patch2:		%{name}-ti-agent.patch
+Patch3:		%{name}-agent.patch
 URL:		http://www.gnome.org/projects/epiphany/
 BuildRequires:	GConf2-devel >= 2.20.0
 BuildRequires:	NetworkManager-devel
@@ -46,6 +47,7 @@
 BuildRequires:	pkgconfig
 BuildRequires:	python-gnome-devel >= 2.20.0
 BuildRequires:	python-pygtk-devel >= 2:2.12.0
+BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(find_lang) >= 1.23
 BuildRequires:	rpmbuild(macros) >= 1.311
 BuildRequires:	scrollkeeper
@@ -122,7 +124,11 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%if "%{pld_release}" == "ti"
 %patch2 -p1
+%else
+%patch3 -p1
+%endif
 
 sed -i -e 's#sr\@Latn#sr\@latin#' po/LINGUAS
 mv po/sr\@{Latn,latin}.po
@@ -222,6 +228,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.184  2008-05-24 19:03:18  hawk
+- use %pld_release macro and apply proper agent patch, BR: rpm >= 4.4.9-56
+
 Revision 1.183  2008-04-26 21:31:07  megabajt
 - release 3
 

================================================================
Index: SPECS/kdelibs.spec
diff -u SPECS/kdelibs.spec:1.563 SPECS/kdelibs.spec:1.564
--- SPECS/kdelibs.spec:1.563	Thu May 15 13:22:55 2008
+++ SPECS/kdelibs.spec	Sat May 24 21:03:18 2008
@@ -40,9 +40,10 @@
 Patch7:		%{name}-xgl.patch
 Patch8:		kde-ac260-lt.patch
 Patch9:		%{name}-lib_loader.patch
-Patch10:	%{name}-konqueror-agent.patch
 # http://kate-editor.org/downloads/syntax_highlighting?kateversion=2.5
-Patch11:	%{name}-kate-syntax.patch
+Patch10:	%{name}-kate-syntax.patch
+Patch11:	%{name}-konqueror-ti-agent.patch
+Patch12:	%{name}-konqueror-agent.patch
 URL:		http://www.kde.org/
 BuildRequires:	OpenEXR-devel >= 1.4.0.a
 BuildRequires:	acl-devel
@@ -92,6 +93,7 @@
 BuildRequires:	qt-devel >= 6:3.3.3-4
 %{?with_hidden_visibility:BuildRequires:	qt-devel >= 6:3.3.5.051113-1}
 %{?with_apidocs:BuildRequires:	qt-doc}
+BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(macros) >= 1.129
 #BuildRequires:	unsermake >= 040511
 BuildRequires:	zlib-devel
@@ -366,7 +368,11 @@
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%if "%{pld_release}" == "ti"
 %patch11 -p1
+%else
+%patch12 -p1
+%endif
 
 mv -f configure{,.dist}
 
@@ -1013,6 +1019,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.564  2008-05-24 19:03:18  hawk
+- use %pld_release macro and apply proper agent patch, BR: rpm >= 4.4.9-56
+
 Revision 1.563  2008-05-15 11:22:55  hawk
 - release 12
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/seamonkey.spec?r1=1.83&r2=1.84&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/mozilla-firefox.spec?r1=1.236&r2=1.237&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kazehakase.spec?r1=1.66&r2=1.67&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/galeon.spec?r1=1.282&r2=1.283&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/epiphany.spec?r1=1.183&r2=1.184&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kdelibs.spec?r1=1.563&r2=1.564&f=u



More information about the pld-cvs-commit mailing list