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

[Damien Durand (splinux)]

Author: splinux

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

Modified Files:
	notecase.spec 
Log Message:
auto-import notecase-1.1.9-2.fc6 on branch devel from notecase-1.1.9-2.fc6.src.rpm


Index: notecase.spec
===================================================================
RCS file: /cvs/extras/rpms/notecase/devel/notecase.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- notecase.spec	27 Sep 2006 10:40:49 -0000	1.18
+++ notecase.spec	27 Sep 2006 10:48:20 -0000	1.19
@@ -1,17 +1,12 @@
 Name:           notecase
 Version:        1.1.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A hierarchical note manager
 
 Group:          Applications/Productivity
 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
@@ -27,22 +22,6 @@
 
 %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"
@@ -79,14 +58,10 @@
 %{_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
+* Wed Sep 27 2006 Damien Durand <splinux at fedoraproject.org> 1.1.9-2
 - Upgrade to 1.1.9
 - Remove patch
+- Bump
 
 * Mon Feb 13 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.1.4-2
 - Rebuild for Fedora Extras 5