rpms/anjuta/devel .cvsignore, 1.8, 1.9 anjuta.spec, 1.27, 1.28 sources, 1.8, 1.9

[Matej Cepl (mcepl)]

Author: mcepl

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

Modified Files:
	.cvsignore anjuta.spec sources 
Log Message:
New upstream source build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/anjuta/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	18 Jan 2007 23:49:49 -0000	1.8
+++ .cvsignore	21 Jul 2007 11:33:57 -0000	1.9
@@ -1 +1 @@
-anjuta-2.1.0.tar.gz
+anjuta-2.2.0.tar.bz2


Index: anjuta.spec
===================================================================
RCS file: /cvs/extras/rpms/anjuta/devel/anjuta.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- anjuta.spec	18 Jan 2007 23:49:49 -0000	1.27
+++ anjuta.spec	21 Jul 2007 11:33:57 -0000	1.28
@@ -1,17 +1,30 @@
+# FIXME missing glade-3 (>= 3.0.2) for glade plugin
+# and binutils-dev for Valgrind debugger
 Summary: Integrated Development Environment
 Name:    anjuta
-Version: 2.1.0
+Version: 2.2.0
 Release: 1%{?dist}
 License: GPL
 Group:   Development/Tools
 URL:     http://www.anjuta.org
-Source0: http://kent.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
-#Patch0: anjuta-dialog.patch
-#Patch0: scintillagtk.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: anjuta-gdl, gnome-build, graphviz, neon, autogen, gettext
-BuildRequires: libgnomeprintui22-devel, vte-devel, pcre-devel, devhelp-devel, anjuta-gdl-devel >= 0.7, gnome-build-devel >= 0.1.4, graphviz-devel, neon-devel, scrollkeeper, perl(XML::Parser), autogen-devel, gettext-devel, gtksourceview-devel, pkgconfig, libtool, autogen-devel
-Requires(post): /sbin/ldconfig
+Source0: http://kent.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
+BuildRoot:  %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+Requires: gnome-build, graphviz, neon, autogen, gettext
+
+BuildRequires:    glib2-devel >= 2.8.0, gtk2-devel >= 2.8.0
+BuildRequires:    ORBit2-devel >= 2.6.0, libglade2-devel >= 2.3.0
+BuildRequires:    libgnome-devel >= 2.12.0, libgnomeui-devel >= 2.12.0
+BuildRequires:    libgnomeprint22-devel >= 2.12.0, libgnomeprintui22-devel >= 2.12.0
+BuildRequires:    gnome-vfs2-devel >= 2.10.0, vte-devel >= 0.9.0
+BuildRequires:    libxml2-devel >= 2.4.23, pango-devel >= 1.1.1
+BuildRequires:    pcre-devel >= 3.9, devhelp-devel >= 0.13
+BuildRequires:    anjuta-gdl-devel >= 0.7.3, gnome-build-devel >= 0.1.4
+BuildRequires:    graphviz-devel >= 1.0, neon-devel >= 0.24.5
+BuildRequires:    subversion-devel >= 1.0.2, gnome-doc-utils >= 0.3.2
+BuildRequires:    scrollkeeper, perl(XML::Parser), autogen-devel
+BuildRequires:    gettext-devel, gtksourceview-devel, pkgconfig
+BuildRequires:    autogen-devel, libtool
+Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 Epoch: 1
 
@@ -45,15 +58,21 @@
 %prep
 %setup -q
 sed -i 's/\r//' doc/ScintillaDoc.html
-%{_bindir}/iconv -t UTF-8 THANKS -o THANKS
-%{_bindir}/iconv -t UTF-8 COPYING -o COPYING
-%{_bindir}/iconv -t UTF-8 NEWS -o NEWS
-%{_bindir}/iconv -t UTF-8 README -o README
+iconv -c -f iso-8859-1 -t utf-8 THANKS -o %{_tmppath}/THANKS
+mv %{_tmppath}/THANKS THANKS
+iconv -c -f iso-8859-1 -t utf-8 COPYING -o %{_tmppath}/COPYING
+mv %{_tmppath}/COPYING COPYING
+iconv -c -f iso-8859-1 -t utf-8 NEWS -o %{_tmppath}/NEWS
+mv %{_tmppath}/NEWS NEWS
+iconv -c -f iso-8859-1 -t utf-8 README -o %{_tmppath}/README
+mv %{_tmppath}/README README
 
 %build
-%configure --disable-static --disable-plugin-subversion --enable-nls
+%configure --disable-static --enable-nls
 %define libnoprefix %(echo %_libdir | sed 's,%_prefix/,,')
-sed -i -e 's!\(.*PACKAGE_PLUGIN_DIR@,.*\)lib\(/anjuta.*\)!\1%{libnoprefix}\2!g' config.status ; ./config.status
+sed -i -e 's!\(.*PACKAGE_PLUGIN_DIR@,.*\)lib\(/anjuta.*\)!\1%{libnoprefix}\2!g' \
+  config.status
+./config.status
 make LIBTOOL=%{_bindir}/libtool %{?_smp_mflags}
 
 %install
@@ -62,12 +81,16 @@
 %find_lang %{name}
 
 desktop-file-install --vendor fedora --delete-original \
-  --dir %{buildroot}/%{_datadir}/applications      \
-  --add-category X-Fedora                              \
+  --dir %{buildroot}/%{_datadir}/applications \
+  --add-category X-Fedora \
   %{buildroot}%{_datadir}/applications/%{name}.desktop
 
 find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
 find %{buildroot} -type f -name "*.a" -exec rm -f {} ';'
+rm -fr %{buildroot}/var/lib/scrollkeeper
+# FIXME: we need to inquire how /usr/share/doc/anjuta
+# is generated
+rm -rf %{buildroot}%{_datadir}/doc/anjuta
 
 %clean
 rm -rf %{buildroot}
@@ -92,7 +115,8 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog NEWS README
+%doc AUTHORS ChangeLog README
+%doc FUTURE MAINTAINERS ROADMAP TODO
 %doc doc/ScintillaDoc.html
 %{_bindir}/%{name}*
 %{_libdir}/lib%{name}*.so.*
@@ -100,7 +124,6 @@
 %{_datadir}/%{name}
 %{_datadir}/applications/*%{name}.desktop
 %{_datadir}/pixmaps/%{name}
-%{_datadir}/doc/%{name}
 %{_datadir}/mime/packages/%{name}.xml
 %{_datadir}/icons/hicolor/48x48/apps/anjuta*
 %{_datadir}/icons/hicolor/scalable/apps/anjuta*
@@ -110,8 +133,8 @@
 
 %files docs
 %defattr(-,root, root, -)
-%{_datadir}/gnome/help/%{name}
-%{_datadir}/omf/%{name}
+%{_datadir}/gnome/help/%{name}-*/
+%{_datadir}/omf/%{name}-manual/
 
 %files devel
 %defattr (-, root, root)
@@ -121,6 +144,12 @@
 %{_datadir}/gtk-doc/html/*%{name}*
 
 %changelog
+* Fri Jul 20 2007 Matej Cepl <mcepl at redhat.com> - 1:2.2.0-1
+- fix unnecessary /usr/share/doc/anjuta and its content and %%doc
+
+* Fri Jul 20 2007 Matej Cepl <mcepl at redhat.com> - 1:2.2.0-0.1
+- Scratch build of new upstream version.
+
 * Tue Jan 16 2007 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.1.0-1
 - bump to new version
 - removed files no longer part of the application


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/anjuta/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	18 Jan 2007 23:49:49 -0000	1.8
+++ sources	21 Jul 2007 11:33:57 -0000	1.9
@@ -1 +1 @@
-3a75cff4b7d905e34ab13ab17267e992  anjuta-2.1.0.tar.gz
+c96861a6143bb11bf553404ac1e279ad  anjuta-2.2.0.tar.bz2