rpms/redet/devel redet-8.23-xdg-utils.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 redet.desktop, 1.1, 1.2 redet.spec, 1.1, 1.2 sources, 1.2, 1.3 redet-8.22-makefilefixes.patch, 1.1, NONE
Debarshi Ray (rishi)
fedora-extras-commits at redhat.com
Thu Nov 29 17:24:29 UTC 2007
Author: rishi
Update of /cvs/pkgs/rpms/redet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10637/devel
Modified Files:
.cvsignore redet.desktop redet.spec sources
Added Files:
redet-8.23-xdg-utils.patch
Removed Files:
redet-8.22-makefilefixes.patch
Log Message:
Initial import into devel.
Modified Files:
devel/.cvsignore devel/redet.desktop devel/redet.spec
devel/sources
Added Files:
devel/redet-8.23-xdg-utils.patch
Removed Files:
devel/redet-8.22-makefilefixes.patch
redet-8.23-xdg-utils.patch:
--- NEW FILE redet-8.23-xdg-utils.patch ---
diff -urNp redet-8.23.orig/redet.tcl redet-8.23/redet.tcl
--- redet-8.23.orig/redet.tcl 2007-11-24 11:34:02.000000000 +0530
+++ redet-8.23/redet.tcl 2007-11-25 00:59:56.000000000 +0530
@@ -170,7 +170,7 @@ set HPWidth 60; # Width of help popup
set HPLines 10; # Number of lines for help popups.
set PaletteHeightLimit 20
-set DefaultBrowser dillo
+set DefaultBrowser xdg-open
#For this purpose dillo is in many respects arguably the best choice because
#it is very lightweight and starts up fast. However, it isn't as fully
#featured as the others, and in particular, doesn't handle the full range of
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/redet/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 9 Jun 2007 00:02:50 -0000 1.2
+++ .cvsignore 29 Nov 2007 17:23:55 -0000 1.3
@@ -1 +1 @@
-redet-8.22.tar.bz2
+redet-8.23.tar.gz
Index: redet.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/redet/devel/redet.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- redet.desktop 9 Jun 2007 00:02:50 -0000 1.1
+++ redet.desktop 29 Nov 2007 17:23:55 -0000 1.2
@@ -1,10 +1,9 @@
[Desktop Entry]
Encoding=UTF-8
Name=Redet
-GenericName=Regular expression development and execution tool
+Comment=Regular expression development and execution tool
Exec=redet
-Icon=redet.png
+Icon=redet
Terminal=false
Type=Application
Categories=Development;
-StartupNotify=true
Index: redet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/redet/devel/redet.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- redet.spec 9 Jun 2007 00:02:50 -0000 1.1
+++ redet.spec 29 Nov 2007 17:23:55 -0000 1.2
@@ -1,81 +1,115 @@
-Name: redet
-Version: 8.22
-Release: 4%{?dist}
-Summary: Regular expression development and execution tool
-
-Group: Development/Tools
-License: GPL
-URL: http://www.billposer.org/Software/redet.html
-Source0: http://www.billposer.org/Software/Downloads/%{name}-%{version}.tar.bz2
-Source1: redet.desktop
-Source2: redet.png
-Patch0: redet-8.22-makefilefixes.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildArch: noarch
-BuildRequires: desktop-file-utils
-Requires: iwidgets
+%if 0%{?fc7}
+%else
+ %define _remove_encoding --remove-key Encoding
+%endif
+
+Summary: Regular expression development and execution tool
+Name: redet
+Version: 8.23
+Release: 3%{?dist}
+License: GPLv3
+Group: Development/Tools
+URL: http://www.billposer.org/Software/redet.html
+Source0: http://www.billposer.org/Software/Downloads/%{name}-%{version}.tar.gz
+Source1: %{name}.png
+Source2: %{name}.desktop
+
+Patch0: %{name}-%{version}-xdg-utils.patch
+
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+Requires: hicolor-icon-theme
+Requires: iwidgets
+Requires: tk
+Requires: xdg-utils
+
+BuildRequires: desktop-file-utils
+
+BuildArch: noarch
%description
-Redet is a tool for developing and executing regular expressions using
-any of more than 50 search programs, editors, and programming languages,
-intended both for developing regular expressions for use elsewhere and
-as a search tool in its own right.
-
-Additional features include persistent history, extensive help, a
-variety of character entry tools, and the ability to change locale while
-running.
+Redet is a tool for developing and executing regular expressions using any of
+more than 50 search programs, editors, and programming languages, intended
+both for developing regular expressions for use elsewhere and as a search tool
+in its own right.
+
+Additional features include persistent history, extensive help, a variety of
+character entry tools, and the ability to change locale while running.
+
+The documentation for this package is in %{name}-doc.
%prep
%setup -q
%patch0 -p1
-sed -i -e 's|set NonBinPath \[file join /usr local share Redet\];|set NonBinPath \[file join /usr share Redet\];|' redet.tcl
-
-gzip redet.1
+sed --expression \
+ 's|set NonBinPath \[file join /usr local share Redet\];|set NonBinPath \[file join %{_datadir} Redet\];|' redet.tcl > redet.tcl.tmp
+touch --reference redet.tcl redet.tcl.tmp
+mv redet.tcl.tmp redet.tcl
%build
%install
rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_usr}
-desktop-file-install --vendor="" \
- --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
- %{SOURCE1}
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
+
+make install PREFIX=%{_prefix} BINDIR=%{_bindir} MANDIR=%{_mandir} \
+ DESTDIR=$RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/
-install -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/
+# icon
+install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
+
+desktop-file-install %{?_remove_encoding} --vendor fedora \
+ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
+ %{SOURCE2}
%clean
rm -rf $RPM_BUILD_ROOT
%post
touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
%postun
touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
%files
%defattr(-,root,root,-)
-%doc README-General AUTHORS COPYING ChangeLog CREDITS NEWS
-%{_bindir}/redet
-%{_datadir}/applications/redet.desktop
-%{_datadir}/icons/hicolor/48x48/apps/redet.png
-%{_mandir}/man1/redet.1.gz
+%doc AUTHORS
+%doc ChangeLog
+%doc COPYING
+%doc CREDITS
+%doc LICENSE
+%doc NEWS
+%doc README-General
+%doc SampleClasses.utf8
+%doc SampleCustomCharacterWidgetDefinition_Armenian
+%doc SampleCustomCharacterWidgetDefinition_Greek
+%doc SampleNewStyleDotRedetRC_Elaborate
+%doc SampleNewStyleDotRedetRC_Simple
+%{_bindir}/%{name}
+%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+%{_mandir}/man1/%{name}.1.gz
%changelog
-* Sat Jun 09 2007 Nigel Jones <dev at nigelj.com> 8.22-4
-- + Dep on desktop-file-utils
-- Minor touch up for .desktop file
-
-* Tue Jun 05 2007 Nigel Jones <dev at nigelj.com> 8.22-3
-- Use kregexpeditor.png for now (until I find a better unique one)
-
-* Fri Jun 01 2007 Nigel Jones <dev at nigelj.com> 8.22-2
-- Add .desktop file
-
-* Wed May 23 2007 Nigel Jones <dev at nigelj.com> 8.22-1
-- Initial SPEC file
+* Sun Nov 25 2007 Debarshi Ray <rishi at fedoraproject.org> - 8.23-3
+- Added 'BINDIR=...' in install stanza.
+- Fixed prep stanza to preserve timestamps and use RPM macros.
+- Removed Encoding from Desktop Entry for all distributions, except Fedora 7.
+
+* Sun Nov 25 2007 Debarshi Ray <rishi at fedoraproject.org> - 8.23-2
+- Upstream re-released tarball.
+- Changed value of License to GPLv3.
+- Added 'Requires: xdg-utils' and fixed the sources.
+- Makefile fixes accepted by upstream.
+
+* Fri Nov 23 2007 Debarshi Ray <rishi at fedoraproject.org> - 8.23-1
+- Initial build. Imported SPEC from Rawhide.
+- Fixed Makefile to preserve timestamps using 'install -p'.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/redet/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 9 Jun 2007 00:02:50 -0000 1.2
+++ sources 29 Nov 2007 17:23:55 -0000 1.3
@@ -1 +1 @@
-0b39caf4ba43be7980a0f54e4752abca redet-8.22.tar.bz2
+09812846ab653dacbb0adf2a61927fbf redet-8.23.tar.gz
--- redet-8.22-makefilefixes.patch DELETED ---
More information about the fedora-extras-commits
mailing list