rpms/anjuta/F-8 anjuta.spec,1.33,1.34
Debarshi Ray (rishi)
fedora-extras-commits at redhat.com
Sat Mar 29 14:51:47 UTC 2008
Author: rishi
Update of /cvs/pkgs/rpms/anjuta/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16360
Modified Files:
anjuta.spec
Log Message:
* Thu Mar 27 2008 Debarshi Ray <rishi at fedoraproject.org> - 1:2.2.3-5
- Fixed Source0 URL according to Fedora packaging guidelines.
- Removed 'BuildRequires: chrpath' and use better ways of removing rpaths.
- Added Scintilla documentation to anjuta-devel.
* Fri Feb 29 2008 Debarshi Ray <rishi at fedoraproject.org> - 1:2.2.3-4
- Restored 'BuildRequires: chrpath' for removing rpaths.
- Added 'Requires: gtk-doc' for anjuta-devel.
* Fri Feb 29 2008 Debarshi Ray <rishi at fedoraproject.org> - 1:2.2.3-3
- Enabled Devhelp plugin on Fedora 7.
- Removed 'BuildRequires: chrpath' and use better ways of removing rpaths.
- Removed 'ExcludeArch: ppc64'.
- Fixed post scriplet for the doc subpackage.
Index: anjuta.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anjuta/F-8/anjuta.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- anjuta.spec 19 Feb 2008 18:31:49 -0000 1.33
+++ anjuta.spec 29 Mar 2008 14:50:43 -0000 1.34
@@ -1,6 +1,5 @@
%if 0%{?fc7}
%else
- %define _enable_devhelp --enable-plugin-devhelp
%define _remove_encoding --remove-key Encoding
%endif
@@ -8,11 +7,11 @@
Name: anjuta
Epoch: 1
Version: 2.2.3
-Release: 2%{?dist}
+Release: 5%{?dist}
License: GPLv2+
Group: Development/Tools
URL: http://www.anjuta.org/
-Source0: http://dl.sf.net/anjuta/%{name}-%{version}.tar.bz2
+Source0: http://downloads.sourceforge.net/anjuta/%{name}-%{version}.tar.bz2
Patch0: %{name}-%{version}-makefile.patch
Patch1: %{name}-%{version}-%{name}-tags.patch
@@ -26,13 +25,11 @@
%if 0%{?fc7}
BuildRequires: libgnomeui-devel
-%else
-BuildRequires: devhelp-devel
%endif
BuildRequires: autogen
-BuildRequires: chrpath
BuildRequires: desktop-file-utils
+BuildRequires: devhelp-devel
BuildRequires: gettext
BuildRequires: glade3-libgladeui-devel
BuildRequires: gnome-doc-utils
@@ -49,8 +46,6 @@
BuildRequires: subversion-devel
BuildRequires: vte-devel
-ExcludeArch: ppc64
-
%description
Anjuta DevStudio is a versatile Integrated Development Environment (IDE) on
GNOME Desktop Environment and features a number of advanced programming
@@ -65,6 +60,7 @@
Summary: Development files for %{name}
Group: Development/Libraries
+Requires: gtk-doc
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: libgnomeui-devel
Requires: libglade2-devel
@@ -99,8 +95,20 @@
iconv --from-code ISO8859-1 --to-code UTF-8 ./THANKS \
--output THANKS.utf-8 && mv THANKS.utf-8 ./THANKS
+# Remove rpaths.
+sed -i.libdir_syssearch --expression \
+ '/sys_lib_dlsearch_path_spec/s|/usr/lib |/usr/lib /usr/lib64 /lib /lib64 |' \
+ configure
+sed -i.gecko --expression 's|-R\$GECKO_HOME||' configure
+
+# pangox.pc contains rpath linkage on PPC64.
+mkdir -p ./PKGCONFIG
+sed --expression 's|-R/usr/lib64||' %{_libdir}/pkgconfig/pangox.pc > \
+ ./PKGCONFIG/pangox.pc
+
%build
-%configure --disable-static --enable-gtk-doc %{?_enable_devhelp} \
+export PKG_CONFIG_PATH="./PKGCONFIG"
+%configure --disable-static --enable-gtk-doc --enable-devhelp \
--enable-plugin-glade --enable-graphviz --enable-plugin-sourceview \
--disable-plugin-valgrind --enable-plugin-subversion \
--with-svn-lib=%{_libdir}
@@ -141,13 +149,6 @@
rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/project/terminal/ChangeLog
rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/project/terminal/AUTHORS
-# Remove rpaths.
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/%{name}
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/%{name}-shell
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/%{name}-tags
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libanjuta.so.0.0.0
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/%{name}/libanjuta-*.so
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -188,7 +189,7 @@
fi
%post doc
-scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
+scrollkeeper-update -q -o %{_datadir}/omf/%{name}-manual || :
%postun doc
scrollkeeper-update -q || :
@@ -203,7 +204,6 @@
%doc README
%doc ROADMAP
%doc THANKS
-%doc doc/ScintillaDoc.html
%{_bindir}/%{name}
%{_bindir}/%{name}_import.sh
%{_bindir}/%{name}_launcher
@@ -232,20 +232,9 @@
%{_libdir}/%{name}/*.plugin
%{_libdir}/%{name}/libanjuta-*.so
-%files doc
-%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
-
-%dir %{_datadir}/omf/%{name}-manual
-%{_datadir}/omf/%{name}-manual/%{name}-manual-C.omf
-
%files devel
%defattr (-,root,root,-)
+%doc doc/ScintillaDoc.html
%{_libdir}/libanjuta-ctags.so
%{_libdir}/libanjuta-egg.so
%{_libdir}/libanjuta.so
@@ -257,7 +246,34 @@
%dir %{_includedir}/libanjuta-1.0
%{_includedir}/libanjuta-1.0/libanjuta
+%files doc
+%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
+
+%dir %{_datadir}/omf/%{name}-manual
+%{_datadir}/omf/%{name}-manual/%{name}-manual-C.omf
+
%changelog
+* Thu Mar 27 2008 Debarshi Ray <rishi at fedoraproject.org> - 1:2.2.3-5
+- Fixed Source0 URL according to Fedora packaging guidelines.
+- Removed 'BuildRequires: chrpath' and use better ways of removing rpaths.
+- Added Scintilla documentation to anjuta-devel.
+
+* Fri Feb 29 2008 Debarshi Ray <rishi at fedoraproject.org> - 1:2.2.3-4
+- Restored 'BuildRequires: chrpath' for removing rpaths.
+- Added 'Requires: gtk-doc' for anjuta-devel.
+
+* Fri Feb 29 2008 Debarshi Ray <rishi at fedoraproject.org> - 1:2.2.3-3
+- Enabled Devhelp plugin on Fedora 7.
+- Removed 'BuildRequires: chrpath' and use better ways of removing rpaths.
+- Removed 'ExcludeArch: ppc64'.
+- Fixed post scriplet for the doc subpackage.
+
* Mon Feb 18 2008 Debarshi Ray <rishi at fedoraproject.org> - 1:2.2.3-2
- Added 'BuildRequires: libgnomeui-devel' to prevent failure on Fedora 7.
- Disabled Devhelp plugin to prevent failure on Fedora 7.
More information about the fedora-extras-commits
mailing list