rpms/anjuta/FC-4 project_type.patch, NONE, 1.1 anjuta-encodings.patch, 1.1, 1.2 anjuta.spec, 1.12, 1.13

[Paul F. Johnson (pfj)]

Author: pfj

Update of /cvs/extras/rpms/anjuta/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29200/FC-4

Modified Files:
	anjuta-encodings.patch anjuta.spec 
Added Files:
	project_type.patch 
Log Message:
auto-import anjuta-1.2.4a-4 on branch FC-4 from anjuta-1.2.4a-4.src.rpm

project_type.patch:

--- NEW FILE project_type.patch ---
--- anjuta-1.2.4a/src/project_type.c	2005-04-06 10:05:45.000000000 +0100
+++ anjuta-1.2.4a/src/project_type.c	2006-07-06 12:53:21.000000000 +0100
@@ -96,7 +96,7 @@
 	"\\\n\t$(PACKAGE_CFLAGS)",
 	"\\\n\t$(PACKAGE_LIBS)",
 	
-	"PKG_CHECK_MODULES(PACKAGE, [gtkmm-2.0])\n"
+	"PKG_CHECK_MODULES(PACKAGE, [gtkmm-2.4])\n"
 	"AC_SUBST(PACKAGE_CFLAGS)\n"
 	"AC_SUBST(PACKAGE_LIBS)",
 

anjuta-encodings.patch:

Index: anjuta-encodings.patch
===================================================================
RCS file: /cvs/extras/rpms/anjuta/FC-4/anjuta-encodings.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- anjuta-encodings.patch	2 Apr 2006 23:38:48 -0000	1.1
+++ anjuta-encodings.patch	6 Jul 2006 16:26:35 -0000	1.2
@@ -1,5 +1,5 @@
---- src/anjuta-encodings.c	2005-12-15 18:50:55.000000000 +0100
-+++ src/anjuta-encodings.c	2005-12-15 18:51:38.000000000 +0100
+--- anjuta-1.2.4a/src/anjuta-encodings.c	2005-12-15 18:50:55.000000000 +0100
++++ anjuta-1.2.4a/src/anjuta-encodings.c	2005-12-15 18:51:38.000000000 +0100
 @@ -707,15 +707,15 @@
  	gtk_tree_view_set_search_column (GTK_TREE_VIEW (stock_treeview),
  									 COLUMN_ENCODING_NAME);
@@ -38,8 +38,8 @@
  	anjuta_preferences_register_property_custom (pref, supported_treeview,
  												SUPPORTED_ENCODINGS,
 
---- src/Makefile.in	2005-08-12 16:37:02.000000000 +0200
-+++ src/Makefile.in	2006-03-24 19:16:54.000000000 +0100
+--- anjuta-1.2.4a/src/Makefile.in	2005-08-12 16:37:02.000000000 +0200
++++ anjuta-1.2.4a/src/Makefile.in	2006-03-24 19:16:54.000000000 +0100
 @@ -723,7 +723,7 @@
  	done
  anjuta$(EXEEXT): $(anjuta_OBJECTS) $(anjuta_DEPENDENCIES) 


Index: anjuta.spec
===================================================================
RCS file: /cvs/extras/rpms/anjuta/FC-4/anjuta.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- anjuta.spec	23 Apr 2006 23:28:29 -0000	1.12
+++ anjuta.spec	6 Jul 2006 16:26:35 -0000	1.13
@@ -1,14 +1,14 @@
 Name:           anjuta
 Version:        1.2.4a
-Release:        1%{?dist}
+Release:        4%{?dist}
 Summary:        GNOME IDE for C and C++
-
 Group:          Development/Tools
 License:        GPL
 URL:            http://anjuta.org/
 Source0:        http://download.sourceforge.net/anjuta/anjuta-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0: anjuta-encodings.patch
+Patch1: project_type.patch
 BuildRequires:  libgnomeui-devel >= 2.0.2
 BuildRequires:  libbonoboui-devel >= 2.0.1
 BuildRequires:  libgnomeprintui22-devel
@@ -48,45 +48,44 @@
 
 %prep
 %setup -q
-%patch -p0 -b .encodings
+%patch0 -p1
+%patch1 -p1
 
 %build
 # configure option --enable-final does not work corretly on x86_64; Use
 # -DNDEBUG in CFLAGS
-export CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS"
-%configure
+#export CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS"
+%configure --disable-static
 %define libnoprefix %(echo %_libdir | sed 's,%_prefix/,,')
 sed -i -e 's!\(.*PACKAGE_PLUGIN_DIR@,.*\)lib\(/anjuta.*\)!\1%{libnoprefix}\2!g' config.status ; ./config.status
 make
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
-%makeinstall
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} install
 %find_lang %{name}
 
 desktop-file-install --vendor fedora --delete-original \
-  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications      \
+  --dir %{buildroot}%{_datadir}/applications      \
   --add-category X-Fedora                              \
-  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
+  %{buildroot}%{_datadir}/applications/%{name}.desktop
 
-find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
-find ${RPM_BUILD_ROOT} -type f -name "*.a" -exec rm -f {} ';'
-rm -rf ${RPM_BUILD_ROOT}%{_localstatedir}/scrollkeeper
-rm -rf ${RPM_BUILD_ROOT}%{_datadir}/doc/anjuta
-install -p -m0755 global-tags/tm_global_tags ${RPM_BUILD_ROOT}%{_bindir}/anjuta_tm_global_tags
-install -m0755 global-tags/create_global_tags.sh ${RPM_BUILD_ROOT}%{_bindir}/anjuta_create_global_tags.sh
+find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
+rm -rf %{buildroot}%{_localstatedir}/scrollkeeper
+rm -rf %{buildroot}%{_datadir}/doc/anjuta
+install -p -m0755 global-tags/tm_global_tags %{buildroot}%{_bindir}/anjuta_tm_global_tags
+install -m0755 global-tags/create_global_tags.sh %{buildroot}%{_bindir}/anjuta_create_global_tags.sh
 perl -pi -e '
     s!(^PROGDIR=).*!$1%{_bindir}!;
     s!(^GLOBAL_TAGS_FILE=).*!$1%{_datadir}/%{name}/system.tags!;
     s!tm_global_tags!%{name}_tm_global_tags!g;
-' ${RPM_BUILD_ROOT}%{_bindir}/anjuta_create_global_tags.sh
-pushd ${RPM_BUILD_ROOT}%{_docdir}
+' %{buildroot}%{_bindir}/anjuta_create_global_tags.sh
+pushd %{buildroot}%{_docdir}
 ln -s anjuta-1.2.4 anjuta
 popd
 
-
 %clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf %{buildroot}
 
 %post docs
 scrollkeeper-update -q
@@ -99,14 +98,14 @@
 %doc AUTHORS COPYING ChangeLog NEWS README TODO
 %doc doc/ScintillaDoc.html
 %{_bindir}/%{name}*
-%{_libdir}/%{name}
+%{_libdir}/%{name}*
 %{_datadir}/%{name}
 %{_datadir}/doc/anjuta
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/pixmaps/%{name}
 %{_datadir}/mime-info/anjuta.mime
 %{_datadir}/mimelnk/application/x-anjuta-project.desktop
-%{_mandir}/man1/*
+%{_datadir}/man/man1/anjuta*
 
 %files docs
 %defattr(-,root,root,-)
@@ -114,6 +113,18 @@
 %{_datadir}/omf/%{name}
 
 %changelog
+* Wed Jul 05 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.2.4a-4
+- Fix for gtkmm
+- altered to buildroot in spec file
+- fix ownership problem
+
+* Wed Jun 21 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.2.4a-3
+- added remove-static to configure line
+- minor alterations to install
+
+* Thu May 11 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.2.4a-2
+- rebuild
+
 * Mon Apr 24 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.2.4a-1
 - Bump to newer version