rpms/anjuta/devel anjuta-encodings.patch, 1.1, 1.2 anjuta.spec, 1.15, 1.16

Paul F. Johnson (pfj) fedora-extras-commits at redhat.com
Fri Mar 24 23:50:47 UTC 2006


Author: pfj

Update of /cvs/extras/rpms/anjuta/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30025/devel

Modified Files:
	anjuta-encodings.patch anjuta.spec 
Log Message:
auto-import anjuta-1.2.4-5 on branch devel from anjuta-1.2.4-5.src.rpm

anjuta-encodings.patch:

Index: anjuta-encodings.patch
===================================================================
RCS file: /cvs/extras/rpms/anjuta/devel/anjuta-encodings.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- anjuta-encodings.patch	20 Feb 2006 23:24:25 -0000	1.1
+++ anjuta-encodings.patch	24 Mar 2006 23:50:46 -0000	1.2
@@ -1,4 +1,4 @@
---- src/anjuta-encodings.c.orig	2005-12-15 18:50:55.000000000 +0100
+--- src/anjuta-encodings.c	2005-12-15 18:50:55.000000000 +0100
 +++ 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),
@@ -37,4 +37,16 @@
  	
  	anjuta_preferences_register_property_custom (pref, supported_treeview,
  												SUPPORTED_ENCODINGS,
- 												"ISO-8859-15",
+
+--- src/Makefile.in	2005-08-12 16:37:02.000000000 +0200
++++ src/Makefile.in	2006-03-24 19:16:54.000000000 +0100
+@@ -723,7 +723,7 @@
+ 	done
+ anjuta$(EXEEXT): $(anjuta_OBJECTS) $(anjuta_DEPENDENCIES) 
+ 	@rm -f anjuta$(EXEEXT)
+-	$(CXXLINK) $(anjuta_LDFLAGS) $(anjuta_OBJECTS) $(anjuta_LDADD) $(LIBS)
++	$(CXXLINK) -Wl,--export-dynamic $(anjuta_LDFLAGS) $(anjuta_OBJECTS) $(anjuta_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+									"ISO-8859-15",


Index: anjuta.spec
===================================================================
RCS file: /cvs/extras/rpms/anjuta/devel/anjuta.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- anjuta.spec	22 Feb 2006 21:32:45 -0000	1.15
+++ anjuta.spec	24 Mar 2006 23:50:46 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           anjuta
 Version:        1.2.4
-Release:        3%{?dist}
+Release:        5%{?dist}
 Summary:        GNOME IDE for C and C++
 
 Group:          Development/Tools
@@ -20,6 +20,8 @@
 BuildRequires:  libtool
 BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
+BuildRequires:	libgnome-devel
+BuildRequires:	gtk2-devel
 Epoch: 1
 Requires:       pkgconfig libtool gettext-devel
 Requires(post):   scrollkeeper
@@ -46,12 +48,12 @@
 
 %prep
 %setup -q
-%patch -p0 -b patch0
+%patch -p0 -b .encodings
 
 %build
 # configure option --enable-final does not work corretly on x86_64; Use
 # -DNDEBUG in CFLAGS
-export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
+export CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS"
 %configure
 %define libnoprefix %(echo %_libdir | sed 's,%_prefix/,,')
 sed -i -e 's!\(.*PACKAGE_PLUGIN_DIR@,.*\)lib\(/anjuta.*\)!\1%{libnoprefix}\2!g' config.status ; ./config.status
@@ -78,6 +80,10 @@
     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}
+ln -s anjuta-1.2.4 anjuta
+popd
+
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -95,6 +101,7 @@
 %{_bindir}/%{name}*
 %{_libdir}/%{name}
 %{_datadir}/%{name}
+%{_datadir}/doc/anjuta
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/pixmaps/%{name}
 %{_datadir}/mime-info/anjuta.mime
@@ -107,6 +114,15 @@
 %{_datadir}/omf/%{name}
 
 %changelog
+* Fri Mar 24 2006 Michael Schwendt <bugs.michael at gmx.net> - 1.2.4-5
+- Added export dynamic
+- trivial spec changes
+
+* Fri Mar 24 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 1.2.4-4
+- Added dependancies for gtk2-devel and libgnome-devel
+- Re-instated debug
+- Add symlink for documentation
+
 * Wed Feb 22 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 1.2.4-3
 - Added back in the epoch - oopsie!
 




More information about the fedora-extras-commits mailing list