rpms/notecase/devel notecase.spec,1.11,1.12
Ignacio Vazquez-Abrams (ivazquez)
fedora-extras-commits at redhat.com
Sat Sep 3 22:08:00 UTC 2005
Author: ivazquez
Update of /cvs/extras/rpms/notecase/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5591/devel
Modified Files:
notecase.spec
Log Message:
- Fixed help file path (#166562)
- Use sed instead of dos2unix
Index: notecase.spec
===================================================================
RCS file: /cvs/extras/rpms/notecase/devel/notecase.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- notecase.spec 23 Jul 2005 07:53:25 -0000 1.11
+++ notecase.spec 3 Sep 2005 22:07:58 -0000 1.12
@@ -1,6 +1,6 @@
Name: notecase
Version: 1.0.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A hierarchical note manager
Group: Applications/Productivity
@@ -11,7 +11,7 @@
Patch1: notecase-1.0.0-paths.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gtk2-devel >= 2.4 desktop-file-utils gettext /usr/bin/dos2unix
+BuildRequires: gtk2-devel >= 2.4 desktop-file-utils gettext
Requires(post): desktop-file-utils shared-mime-info
Requires(postun): desktop-file-utils shared-mime-info
@@ -26,9 +26,10 @@
%setup -q -n notecase
%patch -p1
%patch1 -p1 -b .paths
-find docs -type f -exec /usr/bin/dos2unix \{\} \;
-/usr/bin/dos2unix readme.txt
-sed -i -e 's!\(#define HELP_FILE_PATH\).*!\1 "%{_docdir}/%{name}-%{version}/help.ncd"!
+find docs -type f -exec sed -i -e 's/\r//g' \{\} \;
+sed -i -e 's/\r//g' readme.txt
+%define ncdhelppath %(sed 's|^%{_prefix}||' <<< "%{_docdir}")
+sed -i -e 's!\(#define HELP_FILE_PATH\).*!\1 "%{ncdhelppath}/%{name}-%{version}/help.ncd"!
s!\(#define LOCALE_DIR\).*!\1 "%{_datadir}/locale/"!' src/config.h
%build
@@ -66,6 +67,10 @@
%{_datadir}/mime/packages/%{name}.xml
%changelog
+* Sat Sep 3 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.0-2
+- Fixed help file path (#166562)
+- Use sed instead of dos2unix
+
* Sat Jul 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.0-1
- Upstream update
More information about the fedora-extras-commits
mailing list