packages: gir-repository/gir-repository-gconf2path.patch, gir-repository/gi...

patrys patrys at pld-linux.org
Mon Jul 6 19:43:06 CEST 2009 

Author: patrys                       Date: Mon Jul  6 17:43:06 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 0.6.3

---- Files affected:
packages/gir-repository:
   gir-repository-gconf2path.patch (1.1 -> 1.2) , gir-repository.spec (1.1 -> 1.2) , gir-repository-makefile.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/gir-repository/gir-repository-gconf2path.patch
diff -u packages/gir-repository/gir-repository-gconf2path.patch:1.1 packages/gir-repository/gir-repository-gconf2path.patch:1.2
--- packages/gir-repository/gir-repository-gconf2path.patch:1.1	Sun Nov 23 22:02:14 2008
+++ packages/gir-repository/gir-repository-gconf2path.patch	Mon Jul  6 19:43:01 2009
@@ -1,12 +1,11 @@
-diff -Nur gir-repository.orig/gir/Makefile.am gir-repository.gconf2path/gir/Makefile.am
---- gir-repository.orig/gir/Makefile.am	2008-11-22 23:35:00.000000000 -0700
-+++ gir-repository.gconf2path/gir/Makefile.am	2008-11-23 08:08:57.000000000 -0700
-@@ -36,7 +36,7 @@
+--- gir-repository-0.6.3/gir/Makefile.am~	2009-06-21 23:40:37.000000000 +0200
++++ gir-repository-0.6.3/gir/Makefile.am	2009-07-06 19:22:45.025148943 +0200
+@@ -47,7 +47,7 @@
  endif
  
  if BUILD_GCONF
 -GCONF_INCLUDEDIR=`pkg-config --variable=includedir gconf-2.0`/gconf/2
 +GCONF_INCLUDEDIR=`pkg-config --variable=includedir gconf-2.0`/gconf2
- GCONF_LIBDIR=`pkg-config --variable=libdir gconf-2.0`
- 
- GConf-2.0.gir: $(G_IR_SCANNER)
+ GConf-2.0.gir: $(INTROSPECTION_SCANNER)
+ 	$(INTROSPECTION_SCANNER) -v --namespace GConf --nsversion=2.0 \
+ 	    --add-include-path=$(srcdir) --add-include-path=. \

================================================================
Index: packages/gir-repository/gir-repository.spec
diff -u packages/gir-repository/gir-repository.spec:1.1 packages/gir-repository/gir-repository.spec:1.2
--- packages/gir-repository/gir-repository.spec:1.1	Sun Nov 23 22:02:29 2008
+++ packages/gir-repository/gir-repository.spec	Mon Jul  6 19:43:01 2009
@@ -1,53 +1,68 @@
 # $Revision$, $Date$
-#
-#
-%define svn 20081122
 Summary:	GObject Introspection repository
 Name:		gir-repository
-Version:	0.0
-Release:	0.%{svn}.1
-License:	GPLv2
+Version:	0.6.3
+Release:	1
+License:	GPL v2
 Group:		Development/Libraries
-Source0:	%{name}-%{svn}.tar.bz2
-# Source0-md5:	8dbd2f7a3c8cb8522171c7d826b66345
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gir-repository/0.6/%{name}-%{version}.tar.bz2
+# Source0-md5:	19ace20592762312932d5b01b3dc289a
 Patch0:		%{name}-gconf2path.patch
+Patch1:		%{name}-makefile.patch
 URL:		http://live.gnome.org/GObjectIntrospection
+BuildRequires:	GConf2-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
-#BuildRequires:	intltool
+BuildRequires:	avahi-gobject-devel
+BuildRequires:	babl-devel
+BuildRequires:	clutter-gtk-devel
+BuildRequires:	gnome-keyring-devel
+BuildRequires:	gobject-introspection
+BuildRequires:	gobject-introspection-devel
+BuildRequires:	goocanvas-devel
+BuildRequires:	gssdp-devel
+BuildRequires:	gstreamer-devel
+BuildRequires:	gtk+2-devel
+BuildRequires:	gtk-webkit-devel
+BuildRequires:	gtksourceview2-devel
+BuildRequires:	gupnp-devel
+BuildRequires:	libnotify-devel
+BuildRequires:	libsoup-devel
 BuildRequires:	libtool
+BuildRequires:	poppler-glib-devel
+BuildRequires:	vte-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
+Introspection system for GNOME libraries; see the
+gobject-introspection package.
+
+%package devel
+Summary:	Libraries and headers for gir-repository
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+Requires:	gobject-introspection-devel
+
+%description devel
+Libraries and headers for gir-repository.
 
 %prep
-%setup -q -n %{name}
+%setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
-# if ac/am/* rebuilding is necessary, do it in this order and add
-# appropriate BuildRequires
-#%%{__intltoolize}
-#%%{__gettextize}
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-# if not running libtool or automake, but config.sub is too old:
-#cp -f /usr/share/automake/config.sub .
-%configure
+%configure \
+	--disable-static
 %{__make}
 
-#%{__make} \
-#	CFLAGS="%{rpmcflags}" \
-#	LDFLAGS="%{rpmldflags}"
-
 %install
 rm -rf $RPM_BUILD_ROOT
-# create directories if necessary
-#install -d $RPM_BUILD_ROOT
-#install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -55,47 +70,21 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%pre
-
-%post
-
-%preun
-
-%postun
-
-%if %{with ldconfig}
 %post	-p /sbin/ldconfig
 %postun	-p /sbin/ldconfig
-%endif
-
-%if %{with initscript}
-%post init
-/sbin/chkconfig --add %{name}
-%service %{name} restart
-
-%preun init
-if [ "$1" = "0" ]; then
-	%service -q %{name} stop
-	/sbin/chkconfig --del %{name}
-fi
-%endif
 
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
-%{_libdir}/girepository/*.typelib
-#%{_libdir}/libgirepo-Clutter-custom.a
-#%{_libdir}/libgirepo-Clutter-custom.la
-%{_libdir}/libgirepo-Clutter-custom.so
-#%{_libdir}/libgirepo-Gdk-custom.a
-#%{_libdir}/libgirepo-Gdk-custom.la
-%{_libdir}/libgirepo-Gdk-custom.so
-#%{_libdir}/libgirepo-Gtk-custom.a
-#%{_libdir}/libgirepo-Gtk-custom.la
-%{_libdir}/libgirepo-Gtk-custom.so
-%{_pkgconfigdir}/gir-repository-1.0.pc
-%{_datadir}/gir/*.gir
+%{_libdir}/girepository-1.0/*.typelib
+%attr(755,root,root) %{_libdir}/libgirepo-Clutter-custom.so
+%attr(755,root,root) %{_libdir}/libgirepo-DBus-custom.so
+%attr(755,root,root) %{_libdir}/libgirepo-Gdk-custom.so
+%attr(755,root,root) %{_libdir}/libgirepo-Gtk-custom.so
 
+%files devel
+%defattr(644,root,root,755)
+%{_datadir}/gir-1.0/*.gir
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -103,6 +92,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2009/07/06 17:43:01  patrys
+- up to 0.6.3
+
 Revision 1.1  2008/11/23 21:02:29  aredridel
 - added
 

================================================================
Index: packages/gir-repository/gir-repository-makefile.patch
diff -u /dev/null packages/gir-repository/gir-repository-makefile.patch:1.1
--- /dev/null	Mon Jul  6 19:43:06 2009
+++ packages/gir-repository/gir-repository-makefile.patch	Mon Jul  6 19:43:01 2009
@@ -0,0 +1,12 @@
+--- gir-repository-0.6.3/gir/Makefile.am~	2009-07-06 19:24:31.949253639 +0200
++++ gir-repository-0.6.3/gir/Makefile.am	2009-07-06 19:31:15.353481526 +0200
+@@ -7,9 +7,6 @@
+ COMMON_CUSTOM_LDFLAGS= -avoid-version -rdynamic
+ 
+ AVAHI_GIRSOURCES = AvahiCore-0.6.gir
+-if BUILD_AVAHI
+-CUSTOM_GIRSOURCES += $(AVAHI_GIRSOURCES)
+-endif
+ EXTRA_DIST += $(AVAHI_GIRSOURCES)
+ 
+ MISSIONCONTROL_GIRSOURCES = DBusGLib-1.0.gir \
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gir-repository/gir-repository-gconf2path.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gir-repository/gir-repository.spec?r1=1.1&r2=1.2&f=u

More information about the pld-cvs-commit mailing list