rpms/notecase/FC-4 notecase-1.1.2-buildfix.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 notecase.spec, 1.12, 1.13 sources, 1.4, 1.5 notecase-0.8.9-unix2dos.patch, 1.1, NONE notecase-1.0.0-paths.patch, 1.1, NONE

Ignacio Vazquez-Abrams (ivazquez) fedora-extras-commits at redhat.com
Sun Oct 30 06:34:12 UTC 2005


Author: ivazquez

Update of /cvs/extras/rpms/notecase/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5053/FC-4

Modified Files:
	.cvsignore notecase.spec sources 
Added Files:
	notecase-1.1.2-buildfix.patch 
Removed Files:
	notecase-0.8.9-unix2dos.patch notecase-1.0.0-paths.patch 
Log Message:
Upstream update

notecase-1.1.2-buildfix.patch:

--- NEW FILE notecase-1.1.2-buildfix.patch ---
--- notecase-1.1.2/Makefile.noupdatesrc	2005-10-22 09:22:44.000000000 -0400
+++ notecase-1.1.2/Makefile	2005-10-30 01:42:44.000000000 -0400
@@ -48,7 +48,7 @@
 # define default project to build
 #
 
-all: notecase
+all: bin/notecase
 
 #
 # list of all objects to build (notecase dependencies)
@@ -77,7 +77,7 @@
 GTKLIBS=`if [ "$(HAVE_GNOME_VFS)" == "" ]; then pkg-config --libs gtk+-2.0 glib-2.0; else pkg-config --libs gtk+-2.0 glib-2.0 gnome-vfs-2.0; fi;`
 
 # link program binary
-notecase: updatesrc $(OBJS)
+bin/notecase: $(OBJS)
 	$(LD) $(OBJS) -o $(BIN)/notecase $(FLAGS) $(LDFLAGS) $(GTKLIBS)
 	#strip $(BIN)/notecase
 
@@ -279,7 +279,7 @@
 #
 # install application
 #
-install: notecase poinstall
+install: bin/notecase poinstall
 	install -D -m 755 $(BIN)/notecase "$(bindir)/notecase"
 	install -D -m 644 docs/help.ncd "$(datadir)/doc/notecase/help.ncd"
 	install -D -m 644 docs/notecase.desktop "$(datadir)/applications/notecase.desktop"


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/notecase/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	23 Jul 2005 07:53:24 -0000	1.4
+++ .cvsignore	30 Oct 2005 06:34:10 -0000	1.5
@@ -1 +1 @@
-notecase-1.0.0_src.zip
+notecase-1.1.2_src.zip


Index: notecase.spec
===================================================================
RCS file: /cvs/extras/rpms/notecase/FC-4/notecase.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- notecase.spec	3 Sep 2005 22:07:57 -0000	1.12
+++ notecase.spec	30 Oct 2005 06:34:10 -0000	1.13
@@ -1,17 +1,16 @@
 Name:           notecase
-Version:        1.0.0
-Release:        2%{?dist}
+Version:        1.1.2
+Release:        1%{?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
-Patch:          notecase-0.8.9-unix2dos.patch
-Patch1:         notecase-1.0.0-paths.patch
+Patch:          notecase-1.1.2-buildfix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gtk2-devel >= 2.4 desktop-file-utils gettext
+BuildRequires:  gtk2-devel >= 2.4 desktop-file-utils gettext gnome-vfs2-devel
 Requires(post): desktop-file-utils shared-mime-info
 Requires(postun): desktop-file-utils shared-mime-info
 
@@ -23,17 +22,18 @@
 unencrypted format.
 
 %prep
-%setup -q -n notecase
-%patch -p1
-%patch1 -p1 -b .paths
+%setup -q
+%patch -p1 -b .buildfix
 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
+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
 
 %build
-make LD="$CXX $DEBUG $PROFILE -L%{_libdir} -L%{_prefix}/X11R6/%{_lib} -ldl -export-dynamic" CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -67,6 +67,9 @@
 %{_datadir}/mime/packages/%{name}.xml
 
 %changelog
+* Sun Oct 30 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.1.2-1
+- Upstream update
+
 * 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


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/notecase/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	23 Jul 2005 07:53:24 -0000	1.4
+++ sources	30 Oct 2005 06:34:10 -0000	1.5
@@ -1 +1 @@
-702e508340c736e47ee8ec7e0cbb669a  notecase-1.0.0_src.zip
+e3460f3906e9740577fa8058d7d9b67d  notecase-1.1.2_src.zip


--- notecase-0.8.9-unix2dos.patch DELETED ---


--- notecase-1.0.0-paths.patch DELETED ---




More information about the fedora-extras-commits mailing list