rpms/meld/devel meld-scrollkeeper.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 meld.spec, 1.12, 1.13 sources, 1.7, 1.8
Brian Pepple (bpepple)
fedora-extras-commits at redhat.com
Sun Feb 5 21:31:07 UTC 2006
Author: bpepple
Update of /cvs/extras/rpms/meld/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10664
Modified Files:
.cvsignore meld.spec sources
Added Files:
meld-scrollkeeper.patch
Log Message:
* Sun Feb 5 2006 Brian Pepple <bdpepple at ameritech.net> - 1.1.3-2
- Update to 1.1.3.
- Update scrollkeeper scriptlet.
- Update versions required for pygtk2 & gnome-python2.
- Add patch to disable scrollkeeper in Makefile.
- Ghost the *.pyo.
meld-scrollkeeper.patch:
--- NEW FILE meld-scrollkeeper.patch ---
diff -ru meld-1.1.3.OLD/help/C/GNUmakefile meld-1.1.3/help/C/GNUmakefile
--- meld-1.1.3.OLD/help/C/GNUmakefile 2006-01-28 16:43:57.000000000 -0500
+++ meld-1.1.3/help/C/GNUmakefile 2006-02-05 16:04:32.000000000 -0500
@@ -6,7 +6,6 @@
XML_DIR_ := $(DESTDIR)$(helpdir)/meld/$(LANG)
OMF_NAME := meld-$(LANG).omf
OMF_DIR_ := $(DESTDIR)$(sharedir)/omf/meld
-OMF_STATE:= $(DESTDIR)$(prefix)/var/lib/scrollkeeper
.PHONY : all
all $(OMF_NAME).install : $(OMF_NAME)
@@ -18,7 +17,6 @@
install -m 644 meld.xml $(XML_DIR_)/meld.xml
install -m 644 figures/*.png $(XML_DIR_)/figures
-install -m 644 $< $(OMF_DIR_)/$(OMF_NAME)
- -scrollkeeper-update -p $(OMF_STATE) -o $(OMF_DIR_)
.PHONY : uninstall
uninstall :
@@ -27,7 +25,6 @@
$(XML_DIR_)/figures/*.png
-rmdir $(XML_DIR_)/figures \
$(XML_DIR_)
- -scrollkeeper-update -p $(OMF_STATE) -o $(OMF_DIR_)
.PHONY : clean
clean :
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/meld/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 13 Nov 2005 09:39:53 -0000 1.7
+++ .cvsignore 5 Feb 2006 21:31:07 -0000 1.8
@@ -1 +1 @@
-meld-1.1.2.tar.bz2
+meld-1.1.3.tar.bz2
Index: meld.spec
===================================================================
RCS file: /cvs/extras/rpms/meld/devel/meld.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- meld.spec 17 Jan 2006 22:39:57 -0000 1.12
+++ meld.spec 5 Feb 2006 21:31:07 -0000 1.13
@@ -2,8 +2,8 @@
# spec for FC-4 differs (and could be merged)
Name: meld
-Version: 1.1.2
-Release: 1%{?dist}
+Version: 1.1.3
+Release: 2%{?dist}
Summary: Visual diff and merge tool
Group: Development/Tools
@@ -11,16 +11,17 @@
URL: http://meld.sourceforge.net/
Source0: http://ftp.gnome.org/pub/gnome/sources/meld/1.1/meld-%{version}.tar.bz2
Patch0: desktop.patch
+Patch1: %{name}-scrollkeeper.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: intltool
BuildRequires: scrollkeeper
-Requires: gnome-python2 >= 1.99.14
+Requires: gnome-python2 >= 2.6.0
Requires: gnome-python2-canvas
Requires: gnome-python2-gconf
-Requires: pygtk2 >= 1.99.15
+Requires: pygtk2 >= 2.6.0
Requires: pygtk2-libglade
Requires(post): scrollkeeper
@@ -39,6 +40,7 @@
%prep
%setup -q
%patch0 -p1 -b .desktop
+%patch1 -p1 -b .scrollkeepe
%build
@@ -51,17 +53,18 @@
make prefix=%{_prefix} libdir=%{_datadir} \
DESTDIR=${RPM_BUILD_ROOT} install
+
desktop-file-install --vendor fedora \
--dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
--add-category X-Fedora \
--delete-original \
- ${RPM_BUILD_ROOT}%{_datadir}/applications/meld.desktop
+ ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
%find_lang %{name}
%post
-scrollkeeper-update -q || :
+scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
%postun
@@ -75,16 +78,31 @@
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING
-%{_bindir}/meld
-%{_datadir}/meld/
-%{_datadir}/applications/fedora-meld.desktop
+%{_bindir}/%{name}
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/*.py
+%{_datadir}/%{name}/*.pyc
+%ghost %{_datadir}/%{name}/*.pyo
+%dir %{_datadir}/%{name}/vc
+%{_datadir}/%{name}/vc/*.py
+%{_datadir}/%{name}/vc/*.pyc
+%ghost %{_datadir}/%{name}/vc/*.pyo
+%{_datadir}/%{name}/glade2/
+%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/application-registry/%{name}*
-%{_datadir}/pixmaps/meld.png
+%{_datadir}/pixmaps/%{name}.png
%{_datadir}/gnome/help/%{name}/
%{_datadir}/omf/%{name}/
%changelog
+* Sun Feb 5 2006 Brian Pepple <bdpepple at ameritech.net> - 1.1.3-2
+- Update to 1.1.3.
+- Update scrollkeeper scriptlet.
+- Update versions required for pygtk2 & gnome-python2.
+- Add patch to disable scrollkeeper in Makefile.
+- Ghost the *.pyo.
+
* Sun Nov 13 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.1.2-1
- Update to 1.1.2.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/meld/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 13 Nov 2005 09:39:53 -0000 1.7
+++ sources 5 Feb 2006 21:31:07 -0000 1.8
@@ -1 +1 @@
-a00473f852c32db0bcd48c84b0f27869 meld-1.1.2.tar.bz2
+b958f6b3b5b849607d952f49eb082cba meld-1.1.3.tar.bz2
More information about the fedora-extras-commits
mailing list