rpms/anjuta/devel anjuta.spec,1.43,1.44
Debarshi Ray (rishi)
fedora-extras-commits at redhat.com
Mon May 26 18:57:01 UTC 2008
Author: rishi
Update of /cvs/pkgs/rpms/anjuta/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29844
Modified Files:
anjuta.spec
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.
Index: anjuta.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anjuta/devel/anjuta.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- anjuta.spec 25 May 2008 12:09:54 -0000 1.43
+++ anjuta.spec 26 May 2008 18:56:00 -0000 1.44
@@ -1,8 +1,3 @@
-%if 0%{?fc7}
-%else
- %define _remove_encoding --remove-key Encoding
-%endif
-
Summary: A GNOME development IDE for C/C++
Name: anjuta
Epoch: 1
@@ -28,10 +23,6 @@
Requires(preun): GConf2
Requires(postun): /sbin/ldconfig
-%if 0%{?fc7}
-BuildRequires: libgnomeui-devel
-%endif
-
BuildRequires: autogen
BuildRequires: desktop-file-utils
BuildRequires: devhelp-devel
@@ -43,7 +34,6 @@
BuildRequires: graphviz-devel
BuildRequires: libgdl-devel
BuildRequires: libgnomeprintui22-devel
-# BuildRequires: libwnck-devel
BuildRequires: neon-devel
BuildRequires: pcre-devel
BuildRequires: perl(XML::Parser)
@@ -131,20 +121,12 @@
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
@@ -165,7 +147,9 @@
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-install-rule \
- %{_sysconfdir}/gconf/schemas/[NAME].schemas > /dev/null || :
+ %{_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 || :
@@ -186,7 +170,9 @@
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 || :
+ %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
+ gconftool-2 --makefile-uninstall-rule \
+ %{_sysconfdir}/gconf/schemas/%{name}-*.schemas > /dev/null || :
fi
%postun
@@ -258,8 +244,6 @@
%{_libdir}/libanjuta-ctags.so
%{_libdir}/libanjuta-egg.so
%{_libdir}/libanjuta.so
-%{_libdir}/%{name}/libfile-manager.so
-%{_libdir}/%{name}/liblanguage-manager.so
%{_libdir}/pkgconfig/libanjuta-1.0.pc
%dir %{_datadir}/gtk-doc/html/libanjuta
@@ -269,7 +253,7 @@
%{_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
@@ -283,6 +267,8 @@
%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
More information about the scm-commits
mailing list