rpms/notecase/devel notecase-0.8.9-paths.patch, NONE, 1.1 notecase-0.8.9-unix2dos.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 notecase.spec, 1.8, 1.9 sources, 1.2, 1.3 notecase-0.8.2-paths.patch, 1.1, NONE notecase-0.8.2-strip-unix2dos.patch, 1.1, NONE notecase-0.8.2-x86_64.patch, 1.1, NONE

Ignacio Vazquez-Abrams (ivazquez) fedora-extras-commits at redhat.com
Sun May 29 13:33:42 UTC 2005 

Author: ivazquez

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

Modified Files:
	.cvsignore notecase.spec sources 
Added Files:
	notecase-0.8.9-paths.patch notecase-0.8.9-unix2dos.patch 
Removed Files:
	notecase-0.8.2-paths.patch notecase-0.8.2-strip-unix2dos.patch 
	notecase-0.8.2-x86_64.patch 
Log Message:
Upstream update

notecase-0.8.9-paths.patch:

--- NEW FILE notecase-0.8.9-paths.patch ---
--- notecase/Makefile.paths	2005-05-29 09:20:16.000000000 -0400
+++ notecase/Makefile	2005-05-29 09:24:18.000000000 -0400
@@ -9,6 +9,9 @@
 
 # define install prefix directory
 prefix=/usr
+# additional dirs
+bindir=$(prefix)/bin
+datadir=$(prefix)/share
 # define top of RPM build area
 topdir=/usr/src/redhat
 # define source archive name
@@ -38,7 +41,7 @@
 # define compile/link command line with flags
 # using "--as-needed" to cut down link requirements (check by "readelf -d /usr/bin/notecase | grep NEEDED") 
 CC=$(CXX) $(DEBUG) $(PROFILE) -DENABLE_NLS
-LD=$(CXX) $(DEBUG) $(PROFILE) -L/usr/lib -L/usr/X11R6/lib -ldl -export-dynamic -Os -s -Wl,--as-needed
+LD=$(CXX) $(DEBUG) $(PROFILE) -L$(libdir) -L$(prefix)/X11R6/lib -ldl -export-dynamic -Os -s -Wl,--as-needed
 
 #
 # define default project to build
@@ -206,14 +209,14 @@
 	@for i in $(polangs); do \
 		rm -f po/messages.mo; \
 		msgfmt po/$$i.po -o po/messages.mo; \
-		install -D -m 644 po/messages.mo "$(prefix)/share/locale/$$i/LC_MESSAGES/notecase.mo"; \
+		install -D -m 644 po/messages.mo "$(datadir)/locale/$$i/LC_MESSAGES/notecase.mo"; \
 	done; \
 	rm -f po/messages.mo;
 	@echo done installing translations
 
 pouninstall:
 	@for i in $(polangs); do \
-		rm -f "$(prefix)/share/locale/$$i/LC_MESSAGES/notecase.mo"; \
+		rm -f "$(datadir)/locale/$$i/LC_MESSAGES/notecase.mo"; \
 	done
 	@echo done uninstalling translations
 	
@@ -221,21 +224,21 @@
 # install application
 #
 install: notecase poinstall
-	install -D -m 755 bin/notecase "$(prefix)/bin/notecase"
-	install -D -m 644 docs/help.ncd "$(prefix)/share/doc/notecase/help.ncd"
-	install -D -m 644 docs/notecase.desktop "$(prefix)/share/applications/notecase.desktop"
-	install -D -m 644 docs/notecase.xml "$(prefix)/share/mime/packages/notecase.xml"
-	install -D -m 644 res/notecase.xpm "$(prefix)/share/icons/notecase.xpm"
+	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"
+	install -D -m 644 docs/notecase.xml "$(datadir)/mime/packages/notecase.xml"
+	install -D -m 644 res/notecase.xpm "$(datadir)/icons/notecase.xpm"
 	@echo done installing
 
 #
 # uninstall application
 #
 uninstall:	pouninstall
-	rm -f  "$(prefix)/bin/notecase"
-	rm -f  "$(prefix)/share/applications/notecase.desktop"
-	rm -f  "$(prefix)/share/icons/notecase.xpm"
-	rm -rf "$(prefix)/share/doc/notecase"
+	rm -f  "$(bindir)/notecase"
+	rm -f  "$(datadir)/applications/notecase.desktop"
+	rm -f  "$(datadir)/icons/notecase.xpm"
+	rm -rf "$(datadir)/doc/notecase"
 	@echo done uninstalling
 
 #
@@ -276,7 +279,7 @@
 # - update Linux mime/desktop system
 #
 updatemime:
-	update-mime-database "$(prefix)/share/mime/"
+	update-mime-database "$(datadir)/mime/"
 	update-desktop-database
 
 #

notecase-0.8.9-unix2dos.patch:

--- NEW FILE notecase-0.8.9-unix2dos.patch ---
--- notecase/Makefile.orig	2005-05-27 11:51:10.000000000 -0400
+++ notecase/Makefile	2005-05-29 09:19:05.000000000 -0400
@@ -270,7 +270,7 @@
 	sed -i 's/Source:.*/Source: notecase-$(VERSION)_src.zip/' ./docs/notecase.spec
 	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
-	unix2dos -q -k $(SRCPATH)/*.cpp $(SRCPATH)/*.h $(GUIPATH)/*.cpp $(GUIPATH)/*.h $(GUIPATH)/gui/*.cpp $(GUIPATH)/gui/*.h
+#	unix2dos -q -k $(SRCPATH)/*.cpp $(SRCPATH)/*.h $(GUIPATH)/*.cpp $(GUIPATH)/*.h $(GUIPATH)/gui/*.cpp $(GUIPATH)/gui/*.h
 
 #
 # - update Linux mime/desktop system


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/notecase/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Apr 2005 02:41:07 -0000	1.2
+++ .cvsignore	29 May 2005 13:33:40 -0000	1.3
@@ -1 +1 @@
-notecase-0.8.2_src.zip
+notecase-0.8.9_src.zip


Index: notecase.spec
===================================================================
RCS file: /cvs/extras/rpms/notecase/devel/notecase.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- notecase.spec	22 Apr 2005 19:57:56 -0000	1.8
+++ notecase.spec	29 May 2005 13:33:40 -0000	1.9
@@ -1,15 +1,14 @@
 Name:           notecase
-Version:        0.8.2
-Release:        7
+Version:        0.8.9
+Release:        1
 Summary:        A hierarchical note manager
 
 Group:          Applications/Productivity
 License:        BSD
 URL:            http://notecase.sourceforge.net/
-Source0:        http://osdn.dl.sourceforge.net/sourceforge/notecase/notecase-0.8.2_src.zip
-Patch:          notecase-0.8.2-strip-unix2dos.patch
-Patch1:         notecase-0.8.2-paths.patch
-Patch2:         notecase-0.8.2-x86_64.patch
+Source0:        http://osdn.dl.sourceforge.net/sourceforge/notecase/notecase-%{version}_src.zip
+Patch:          notecase-0.8.9-unix2dos.patch
+Patch1:         notecase-0.8.9-paths.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.4 desktop-file-utils gettext /usr/bin/dos2unix
@@ -27,7 +26,6 @@
 %setup -q -n notecase
 %patch -p1
 %patch1 -p1 -b .paths
-%patch2 -p1 -b .x86_64
 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"!
@@ -69,6 +67,9 @@
 %{_datadir}/mime/packages/%{name}.xml
 
 %changelog
+* Sun May 29 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.8.9-1
+- Upstream update
+
 * Fri Apr 22 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.8.2-7
 - Bump
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/notecase/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Apr 2005 02:41:07 -0000	1.2
+++ sources	29 May 2005 13:33:40 -0000	1.3
@@ -1 +1 @@
-4b085d4dfeaccaded45d503e42d2daa0  notecase-0.8.2_src.zip
+a88b8b75c70939ebfd95307a926d38d1  notecase-0.8.9_src.zip


--- notecase-0.8.2-paths.patch DELETED ---


--- notecase-0.8.2-strip-unix2dos.patch DELETED ---


--- notecase-0.8.2-x86_64.patch DELETED ---

More information about the fedora-extras-commits mailing list