rpms/notecase/devel notecase.spec,1.17,1.18

[Damien Durand (splinux)]

Author: splinux

Update of /cvs/extras/rpms/notecase/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17830

Modified Files:
	notecase.spec 
Log Message:



Index: notecase.spec
===================================================================
RCS file: /cvs/extras/rpms/notecase/devel/notecase.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- notecase.spec	27 Sep 2006 10:39:02 -0000	1.17
+++ notecase.spec	27 Sep 2006 10:40:49 -0000	1.18
@@ -7,6 +7,11 @@
 License:        BSD
 URL:            http://notecase.sourceforge.net/
 Source0:        http://dl.sourceforge.net/sourceforge/notecase/notecase-%{version}_src.zip
+<<<<<<< notecase.spec
+#Patch:          notecase-1.1.2-buildfix.patch
+#Patch1:         notecase-1.1.4-wwtt.patch
+=======
+>>>>>>> 1.17
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.4 desktop-file-utils gettext gnome-vfs2-devel
@@ -22,6 +27,22 @@
 
 %prep
 %setup -q
+<<<<<<< notecase.spec
+#%patch -p1 -b .buildfix
+#%patch1 -p1 -b .wwtt
+#find docs -type f -exec sed -i -e 's/\r//g' \{\} \;
+#find src -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
+#sed -i 's/\#define APP_VER_STR .*/\#define APP_VER_STR "%{version}"\r/' 
+#./src/config.h
+#sed -i 's:\#define INSTALL_PREFIX .*:\#define INSTALL_PREFIX 
+#"%{_prefix}"\r:' ./src/config.h
+=======
+>>>>>>> 1.17
 
 %build
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS"
@@ -58,6 +79,11 @@
 %{_datadir}/mime/packages/%{name}.xml
 
 %changelog
+
+* Mon Feb 13 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.1.9-1
+- Upgrade to 1.1.9
+
+=======
 * Wed Sep 27 2006 Damien Durand <splinux at fedoraproject.org> 1.1.9-1
 - Upgrade to 1.1.9
 - Remove patch