rpms/anjuta/F-9 anjuta-2.4.1-makefile.patch, NONE, 1.1 anjuta.spec, 1.41, 1.42 anjuta-2.2.3-anjuta-tags.patch, 1.1, NONE anjuta-2.2.3-makefile.patch, 1.1, NONE anjuta-2.2.3-missing-header.patch, 1.1, NONE

Debarshi Ray (rishi) fedora-extras-commits at redhat.com
Mon May 26 19:06:27 UTC 2008 

Author: rishi

Update of /cvs/pkgs/rpms/anjuta/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4111

Modified Files:
	anjuta.spec 
Added Files:
	anjuta-2.4.1-makefile.patch 
Removed Files:
	anjuta-2.2.3-anjuta-tags.patch anjuta-2.2.3-makefile.patch 
	anjuta-2.2.3-missing-header.patch 
Log Message:
* Sat May 24 2008 Debarshi Ray <rishi at fedoraproject.org> - 1:2.4.1-1
- Version bump to 2.4.1. Closes Red Hat Bugzilla bug #446242.
- Spurious file modification messages from Scintilla fixed by upstream. Closes
  Red Hat Bugzilla bug #447090.


anjuta-2.4.1-makefile.patch:

--- NEW FILE anjuta-2.4.1-makefile.patch ---
diff -urNp anjuta-2.4.1.orig/src/Makefile.in anjuta-2.4.1/src/Makefile.in
--- anjuta-2.4.1.orig/src/Makefile.in	2008-04-07 12:43:58.000000000 +0530
+++ anjuta-2.4.1/src/Makefile.in	2008-05-24 22:49:14.000000000 +0530
@@ -421,6 +421,7 @@ anjuta_pixmaps_DATA = \
 
 AM_CPPFLAGS = \
 	$(GNOME_UI_CFLAGS)\
+	$(GLADE_CFLAGS) \
 	$(GDL_CFLAGS)\
 	-I$(top_srcdir)\
 	-I.. -I. -DPACKAGE_BIN_DIR=\"$(bindir)\" \


Index: anjuta.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anjuta/F-9/anjuta.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- anjuta.spec	14 May 2008 02:54:51 -0000	1.41
+++ anjuta.spec	26 May 2008 19:04:29 -0000	1.42
@@ -1,46 +1,39 @@
-%if 0%{?fc7}
-%else
-  %define _remove_encoding --remove-key Encoding
-%endif
-
 Summary:	A GNOME development IDE for C/C++
 Name:		anjuta
 Epoch:		1
-Version:	2.2.3
-Release:	8%{?dist}
+Version:	2.4.1
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
 URL:		http://www.anjuta.org/
 Source0:	http://downloads.sourceforge.net/anjuta/%{name}-%{version}.tar.bz2
 
 Patch0:		%{name}-%{version}-makefile.patch
-Patch1:		%{name}-%{version}-missing-header.patch
-Patch2:		%{name}-%{version}-%{name}-tags.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
+Requires:	GConf2
 Requires:	autogen
+Requires:	glade3-libgladeui
 Requires:	gnome-icon-theme
 Requires:	hicolor-icon-theme
+Requires(pre):	GConf2
+Requires(post):	GConf2
 Requires(post):	/sbin/ldconfig
+Requires(preun):  GConf2
 Requires(postun): /sbin/ldconfig
 
-%if 0%{?fc7}
-BuildRequires:	libgnomeui-devel
-%endif
-
 BuildRequires:	autogen
 BuildRequires:	desktop-file-utils
 BuildRequires:	devhelp-devel
 BuildRequires:	gettext
 BuildRequires:	glade3-libgladeui-devel
 BuildRequires:	gnome-doc-utils
-BuildRequires:	gtksourceview-devel
+BuildRequires:	gtksourceview2-devel
 BuildRequires:	gnome-build-devel
 BuildRequires:	graphviz-devel
 BuildRequires:	libgdl-devel
 BuildRequires:	libgnomeprintui22-devel
-BuildRequires:	libwnck-devel
 BuildRequires:	neon-devel
 BuildRequires:	pcre-devel
 BuildRequires:	perl(XML::Parser)
@@ -89,8 +82,6 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 # Suppress rpmlint error.
 chmod 644 `find . -name "*.cxx" -perm /111 -print`
@@ -111,8 +102,9 @@
 
 %build
 export PKG_CONFIG_PATH="./PKGCONFIG"
-%configure --disable-static --enable-gtk-doc --enable-devhelp \
-  --enable-plugin-glade --enable-graphviz --enable-plugin-sourceview \
+%configure --disable-schemas-install --disable-static --enable-gtk-doc \
+  --enable-devhelp --enable-plugin-glade --enable-graphviz \
+  --enable-plugin-scintilla --enable-plugin-sourceview \
   --disable-plugin-valgrind --enable-plugin-subversion \
   --with-svn-lib=%{_libdir}
 
@@ -123,34 +115,42 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 
 # Installs zero-length files necessary for proper behaviour.
 make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name "*.la" -delete
 
-%if 0%{?fc7}
- rm -rf $RPM_BUILD_ROOT%{_var}/lib/scrollkeeper
-%endif
-
-# Move architecture dependent file from /usr/share/anjuta/scripts to /usr/bin.
-mv $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts/%{name}-tags \
-  $RPM_BUILD_ROOT%{_bindir}
-
 # Use %doc instead.
 rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
 
 %find_lang %{name}
 
-desktop-file-install %{?_remove_encoding} --vendor fedora --delete-original \
+desktop-file-install --remove-key Encoding --vendor fedora --delete-original \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+if [ "$1" -gt 1 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  gconftool-2 --makefile-uninstall-rule \
+    %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || :
+  gconftool-2 --makefile-uninstall-rule \
+    %{_sysconfdir}/gconf/schemas/%{name}-*.schemas >/dev/null || :
+fi
+
 %post
 /sbin/ldconfig
 
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule \
+  %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
+gconftool-2 --makefile-install-rule \
+  %{_sysconfdir}/gconf/schemas/%{name}-*.schemas > /dev/null || :
+
 if [ -x %{_bindir}/update-desktop-database ]; then
   update-desktop-database &> /dev/null || :
 fi
@@ -166,6 +166,15 @@
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
+%preun
+if [ "$1" -eq 0 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  gconftool-2 --makefile-uninstall-rule \
+    %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
+  gconftool-2 --makefile-uninstall-rule \
+    %{_sysconfdir}/gconf/schemas/%{name}-*.schemas > /dev/null || :
+fi
+
 %postun
 /sbin/ldconfig
 
@@ -203,19 +212,22 @@
 %{_bindir}/%{name}
 %{_bindir}/%{name}_import.sh
 %{_bindir}/%{name}_launcher
-%{_bindir}/%{name}-shell
-%{_bindir}/%{name}-tags
 %{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/glade3/catalogs/anjuta-glade.xml
 %{_datadir}/icons/gnome/48x48/mimetypes/gnome-mime-application-x-%{name}.png
 %{_datadir}/icons/gnome/scalable/mimetypes/gnome-mime-application-x-%{name}.svg
 %{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
 %{_datadir}/mime/packages/%{name}.xml
+# No soname.
+%{_libdir}/glade3/modules/libgladeanjuta.so
 %{_libdir}/libanjuta-ctags.so.*
 %{_libdir}/libanjuta-egg.so.*
 %{_libdir}/libanjuta.so.*
 %{_mandir}/man1/%{name}.1.gz
 %{_mandir}/man1/%{name}_launcher.1.gz
+%{_sysconfdir}/gconf/schemas/%{name}.schemas
+%{_sysconfdir}/gconf/schemas/%{name}-*.schemas
 
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/*
@@ -224,9 +236,7 @@
 %{_datadir}/pixmaps/%{name}/*
 
 %dir %{_libdir}/%{name}
-# Contains *.so files that are not symlinked to *.so.* files.
-%{_libdir}/%{name}/*.plugin
-%{_libdir}/%{name}/libanjuta-*.so
+%{_libdir}/%{name}/*
 
 %files devel
 %defattr (-,root,root,-)
@@ -243,18 +253,23 @@
 %{_includedir}/libanjuta-1.0/libanjuta
 
 %files doc
-%defattr(-,root, root,-)
+%defattr(-,root,root,-)
 
 %dir %{_datadir}/gnome/help/%{name}-faqs
 %{_datadir}/gnome/help/%{name}-faqs/C
 
 %dir %{_datadir}/gnome/help/%{name}-manual
-%{_datadir}/gnome/help/%{name}-manual/C
+%{_datadir}/gnome/help/%{name}-manual/*
 
 %dir %{_datadir}/omf/%{name}-manual
-%{_datadir}/omf/%{name}-manual/%{name}-manual-C.omf
+%{_datadir}/omf/%{name}-manual/%{name}-manual-*.omf
 
 %changelog
+* Sat May 24 2008 Debarshi Ray <rishi at fedoraproject.org> - 1:2.4.1-1
+- Version bump to 2.4.1. Closes Red Hat Bugzilla bug #446242.
+- Spurious file modification messages from Scintilla fixed by upstream. Closes
+  Red Hat Bugzilla bug #447090.
+
 * Tue May 13 2008 Debarshi Ray <rishi at fedoraproject.org> - 1:2.2.3-8
 - Added missing header to fix build failure on ia64. Closes Red Hat Bugzilla
   bug #446020.


--- anjuta-2.2.3-anjuta-tags.patch DELETED ---


--- anjuta-2.2.3-makefile.patch DELETED ---


--- anjuta-2.2.3-missing-header.patch DELETED ---

More information about the fedora-extras-commits mailing list