OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web openpkg$ Date: 16-Nov-2003 13:11:44
Branch: HEAD Handle: 2003111612114202
Added files:
openpkg-src/atk atk.patch
Modified files:
openpkg-re/vcheck vc.atk
openpkg-src/atk atk.spec
openpkg-web news.txt
Log:
cleanup packaging
Summary:
Revision Changes Path
1.4 +3 -1 openpkg-re/vcheck/vc.atk
1.1 +21 -0 openpkg-src/atk/atk.patch
1.14 +5 -3 openpkg-src/atk/atk.spec
1.7426 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/vcheck/vc.atk
============================================================================
$ cvs diff -u -r1.3 -r1.4 vc.atk
--- openpkg-re/vcheck/vc.atk 10 Jun 2003 07:07:47 -0000 1.3
+++ openpkg-re/vcheck/vc.atk 16 Nov 2003 12:11:42 -0000 1.4
@@ -3,7 +3,9 @@
prog atk = {
version = 1.2.4
- url = ftp://ftp.gtk.org/pub/gtk/v2.2/
+ url = ftp://ftp.gtk.org/pub/gtk/
+ regex = (v2\.[246])
+ url = ftp://ftp.gtk.org/pub/gtk/__NEWVER__/
regex = atk-(__VER__)\.tar\.gz
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/atk/atk.patch
============================================================================
$ cvs diff -u -r0 -r1.1 atk.patch
--- /dev/null 2003-11-16 13:11:44.000000000 +0100
+++ atk.patch 2003-11-16 13:11:44.000000000 +0100
@@ -0,0 +1,21 @@
+Index: atk/Makefile.in
+--- atk/Makefile.in.orig 2003-05-12 09:40:27.000000000 +0200
++++ atk/Makefile.in 2003-11-16 13:09:52.000000000 +0100
+@@ -145,7 +145,7 @@
+ LDFLAGS = -version-info $(LT_VERSION_INFO) $(export_symbols)
$(no_undefined) @DEP_LIBS@
+
+
+-libatkincludedir = $(includedir)/atk-1.0/atk
++libatkincludedir = $(includedir)/atk-1.0
+
+ atk_headers = atk.h atkaction.h
atkcomponent.h atkdocument.h
atkeditabletext.h atkgobjectaccessible.h atkhyperlink.h
atkhypertext.h atknoopobject.h
atknoopobjectfactory.h atkobject.h atkobjectfactory.h
atkimage.h atkregistry.h atkrelation.h
atkrelationtype.h atkrelationset.h
atkselection.h atkstate.h atkstateset.h
atkstreamablecontent.h atktable.h atktext.h
atkutil.h atkvalue.h
+
+Index: atk.pc.in
+--- atk.pc.in.orig 2002-03-05 18:27:29.000000000 +0100
++++ atk.pc.in 2003-11-16 13:09:30.000000000 +0100
+@@ -8,4 +8,4 @@
+ Version: @VERSION@
+ Requires: @GLIB_PACKAGES@
+ Libs: -L${libdir} [EMAIL PROTECTED]@
+-Cflags: -I${includedir}/atk-1.0
++Cflags: -I${includedir}/atk-1.0 -I${includedir}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/atk/atk.spec
============================================================================
$ cvs diff -u -r1.13 -r1.14 atk.spec
--- openpkg-src/atk/atk.spec 8 Jul 2003 14:38:41 -0000 1.13
+++ openpkg-src/atk/atk.spec 16 Nov 2003 12:11:44 -0000 1.14
@@ -38,15 +38,16 @@
Group: XWindow
License: GPL
Version: %{V_atk}
-Release: 20030612
+Release: 20031116
# list of sources
Source0: ftp://ftp.gtk.org/pub/gtk/v%{V_gtk_major}/atk-%{V_atk}.tar.gz
+Patch0: atk.patch
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20020206, make, X11, glib2 >= %{V_glib_major}
+BuildPreReq: OpenPKG, openpkg >= 20020206, X11, glib2 >= %{V_glib_major}, make
PreReq: OpenPKG, openpkg >= 20020206, X11, glib2 >= %{V_glib_major}
AutoReq: no
AutoReqProv: no
@@ -59,6 +60,7 @@
%prep
%setup -q -n atk-%{version}
+ %patch -p0
%{l_shtool} subst \
-e 's;/atk-1\.0;/atk;g' \
-e 's;libatk-1\.0\.la;libatk.la;g' \
@@ -90,7 +92,7 @@
rm -rf $RPM_BUILD_ROOT
%{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/gtk-doc
- rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/locale
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib/locale
rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib/*.la
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.7425 -r1.7426 news.txt
--- openpkg-web/news.txt 16 Nov 2003 12:07:58 -0000 1.7425
+++ openpkg-web/news.txt 16 Nov 2003 12:11:42 -0000 1.7426
@@ -1,3 +1,4 @@
+16-Nov-2003: Upgraded package: P<atk-1.2.4-20031116>
16-Nov-2003: Upgraded package: P<pango-1.2.5-20031116>
16-Nov-2003: New package: P<xft-2.1.2-20031116>
16-Nov-2003: Upgraded package: P<fontconfig-2.2.90-20031116>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
