devel/notecase notecase-0.8.2-paths.patch, NONE, 1.1 notecase.spec, 1.3, 1.4

[Ignacio Vazquez-Abrams (ivazquez)]

Author: ivazquez

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

Modified Files:
	notecase.spec 
Added Files:
	notecase-0.8.2-paths.patch 
Log Message:
* Tue Apr  6 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.8.2-4
- Change group to Applications/Productivity
- Have dos2unix only convert files
- Fixed hard-coded paths in the Makefile


notecase-0.8.2-paths.patch:

--- NEW FILE notecase-0.8.2-paths.patch ---
--- notecase-0.8.2/Makefile.orig	2005-04-06 17:13:12.714664873 -0400
+++ notecase-0.8.2/Makefile	2005-04-06 17:41:41.659535952 -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
@@ -36,7 +39,7 @@
 
 # define compile/link command line with flags
 CC=$(CXX) $(DEBUG) $(PROFILE) -DENABLE_NLS
-LD=$(CXX) $(DEBUG) $(PROFILE) -L/usr/lib -L/usr/X11R6/lib -ldl -export-dynamic
+LD=$(CXX) $(DEBUG) $(PROFILE) -L$(libdir) -L$(prefix)/X11R6/lib -ldl -export-dynamic
 
 #
 # define default project to build
@@ -195,14 +198,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
 	
@@ -210,21 +213,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
 
 #
@@ -263,7 +266,7 @@
 # - update Linux mime system (under construction!!!)
 #
 updatemime:
-	update-mime-database "$(prefix)/share/mime/"
+	update-mime-database "$(datadir)/mime/"
 
 
 #


Index: notecase.spec
===================================================================
RCS file: /cvs/extras/devel/notecase/notecase.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- notecase.spec	5 Apr 2005 10:21:12 -0000	1.3
+++ notecase.spec	6 Apr 2005 23:44:03 -0000	1.4
@@ -1,13 +1,14 @@
 Name:           notecase
 Version:        0.8.2
-Release:        3
+Release:        4
 Summary:        A hierarchical note manager
 
-Group:          Applications/Text
+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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.4 desktop-file-utils gettext /usr/bin/dos2unix
@@ -24,11 +25,12 @@
 %prep
 %setup -q -n notecase
 %patch -p1
-find docs -exec /usr/bin/dos2unix \{\} \;
+%patch1 -p1 .paths
+find docs -type f -exec /usr/bin/dos2unix \{\} \;
 /usr/bin/dos2unix readme.txt
 
 %build
-make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
+make LD="$(CXX) $(DEBUG) $(PROFILE) -L%{_libdir} -L%{_prefix}/X11R6/%{_lib} -ldl -export-dynamic" CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -62,6 +64,11 @@
 %{_datadir}/mime/packages/%{name}.xml
 
 %changelog
+* Tue Apr  6 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.8.2-4
+- Change group to Applications/Productivity
+- Have dos2unix only convert files
+- Fixed hard-coded paths in the Makefile
+
 * Tue Apr  5 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.8.2-3
 - Use dos2unix instead of sed