rpms/gedit/devel .cvsignore, 1.39, 1.40 gedit.spec, 1.79, 1.80 sources, 1.41, 1.42
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue May 9 23:28:04 UTC 2006
Author: mclasen
Update of /cvs/dist/rpms/gedit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5440
Modified Files:
.cvsignore gedit.spec sources
Log Message:
2.15.1
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gedit/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore 10 Apr 2006 21:46:24 -0000 1.39
+++ .cvsignore 9 May 2006 23:28:00 -0000 1.40
@@ -1,16 +1 @@
-gedit-2.10.3.tar.bz2
-gedit-2.10.4.tar.bz2
-gedit-2.11.91.tar.bz2
-gedit-2.12.0.tar.bz2
-gedit-2.12.1.tar.bz2
-gedit-2.13.0.tar.bz2
-gedit-2.13.1.tar.bz2
-gedit-2.13.2.tar.bz2
-gedit-2.13.3.tar.bz2
-gedit-2.13.4.tar.bz2
-gedit-2.13.90.tar.bz2
-gedit-2.13.91.tar.bz2
-gedit-2.13.92.tar.bz2
-gedit-2.14.0.tar.bz2
-gedit-2.14.1.tar.bz2
-gedit-2.14.2.tar.bz2
+gedit-2.15.1.tar.bz2
Index: gedit.spec
===================================================================
RCS file: /cvs/dist/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- gedit.spec 10 Apr 2006 21:46:24 -0000 1.79
+++ gedit.spec 9 May 2006 23:28:00 -0000 1.80
@@ -16,8 +16,8 @@
Summary: gEdit is a small but powerful text editor for GNOME.
Name: gedit
-Version: 2.14.2
-Release: 2
+Version: 2.15.1
+Release: 1
Epoch: 1
License: GPL
Group: Applications/Editors
@@ -25,9 +25,12 @@
URL: http://gedit.sourceforge.net/
BuildRoot: %{_tmppath}/gedit-%{version}-root
-PreReq: scrollkeeper >= 0.1.4
-PreReq: GConf2
-PreReq: desktop-file-utils >= %{desktop_file_utils_version}
+Requires(post): desktop-file-utils >= %{desktop_file_utils_version}
+Requires(post): scrollkeeper >= 0.1.4
+Requires(post): GConf2
+Requires(preun): GConf2
+Requires(postun): scrollkeeper >= 0.1.4
+Requires(postun): desktop-file-utils >= %{desktop_file_utils_version}
# Make the file selector remember last window size
Patch0: gedit-2.13.2-filesel.patch
@@ -120,13 +123,10 @@
rm -rf $RPM_BUILD_ROOT
%post
-update-desktop-database %{_datadir}/applications
-scrollkeeper-update
+update-desktop-database -q
+scrollkeeper-update -q
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-SCHEMAS="gedit.schemas"
-for S in $SCHEMAS; do
- gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null
-done
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gedit.schemas > /dev/null
# update icon themes
touch %{_datadir}/icons/hicolor
@@ -134,9 +134,20 @@
/usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
fi
+%preun
+if [ "$1" -eq 0 ]; then
+ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+ gconftool-2 --makefile-uninstall-rule \
+ %{_sysconfdir}/gconf/schemas/gedit.schemas > /dev/null || :
+fi
+
%postun
-update-desktop-database %{_datadir}/applications
-scrollkeeper-update
+update-desktop-database -q
+scrollkeeper-update -q
+touch %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+ /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+fi
%files -f %{po_package}.lang
%defattr(-, root, root)
@@ -158,6 +169,9 @@
%{_libdir}/pkgconfig/gedit-2.14.pc
%changelog
+* Tue May 9 2006 Matthias Clasen <mclasen at redhat.com> 2.15.1-1
+- Update to 2.15.1
+
* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> 2.14.2-2
- Update to 2.14.2
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gedit/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources 10 Apr 2006 21:46:24 -0000 1.41
+++ sources 9 May 2006 23:28:00 -0000 1.42
@@ -1 +1 @@
-35d146a924fd426d448048e8db383334 gedit-2.14.2.tar.bz2
+891084f0dd8880a24ca8d5108b9ee13a gedit-2.15.1.tar.bz2
More information about the fedora-cvs-commits
mailing list