[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: Request for sponsor: notecase



On Mon, 2005-04-04 at 22:40 -0400, Ignacio Vazquez-Abrams wrote:
> On Mon, 2005-04-04 at 21:47 -0400, Toshio wrote:
> > I've also got some patches:: one for the spec file, one for the notecase
> > Makefile.
> 
> Cool. Hit me.
They should have been attached to the last message.  Here they are
again.

-Toshio

(And in case they're getting stripped out, I threw them onto::
http://www.tiki-lounge.com/~toshio/fedora/notecase-spec.patch
http://www.tiki-lounge.com/~toshio/fedora/notecase-strip-unix2dos.patch
)

-- 
________S_________U_________B_________L_________I_________M_________E________
     t  o  s  h  i  o  @  t  i  k  i  -  l  o  u  n  g  e  .  c  o  m
                                                                GA->ME 1999
--- notecase.spec.bak	2005-04-03 15:44:05.000000000 -0400
+++ notecase.spec	2005-04-04 10:33:09.000000000 -0400
@@ -1,15 +1,19 @@
 Name:           notecase
 Version:        0.8.2
-Release:        1
+Release:        2
 Summary:        A hierarchical note manager
 
 Group:          Applications/Text
 License:        BSD
 URL:            http://notecase.sourceforge.net/
 Source0:        http://osdn.dl.sourceforge.net/sourceforge/notecase/notecase-0.8.2_src.zip
+Patch0:		http://www.tiki-lounge.com/~toshio/fedora/notecase-strip-unix2dos.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gtk2-devel >= 2.4 desktop-file-utils
+BuildRequires:  gtk2-devel >= 2.4
+BuildRequires: desktop-file-utils
+BuildRequires: dos2unix
+BuildRequires: gettext
 Requires(post): desktop-file-utils shared-mime-info
 Requires(postun): desktop-file-utils shared-mime-info
 
@@ -22,9 +26,12 @@
 
 %prep
 %setup -q -n notecase
+%patch0 -p1
+find docs -exec dos2unix \{\} \;
+dos2unix readme.txt
 
 %build
-make %{?_smp_mflags}
+make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -50,13 +57,19 @@
 update-desktop-database &> /dev/null || :
 
 %files -f %{name}.lang
-%defattr(-,root,root,-)
+%defattr(0644,root,root,0755)
 %doc readme.txt docs/license.txt docs/help.ncd
-%{_bindir}/%{name}
 %{_datadir}/applications/*%{name}.desktop
 %{_datadir}/icons/%{name}.*
 %{_datadir}/mime/packages/%{name}.xml
+%attr(0755,root,root) %{_bindir}/%{name}
 
 %changelog
+* Sun Apr 3 2005 Toshio Kuratomi <toshio-tiki-lounge.com> - 0.8.2-2
+- Add BR dos2unix for distributed text file conversion.
+- Fix permissions of documentation.
+- Use RPM_OPT_FLAGS.
+- Patch to not strip binaries (so debuginfo works) and not use unix2dos.
+ 
 * Thu Mar 31 2005 Ignacio Vazquez-Abrams <ivazquez ivazquez net> 0.8.2-1
 - Initial RPM release
--- notecase/Makefile.strip	2005-04-03 22:07:28.000000000 -0400
+++ notecase/Makefile	2005-04-03 22:16:54.000000000 -0400
@@ -66,7 +66,7 @@
 # link program binary
 notecase: updatesrc $(OBJS)
 	$(LD) $(OBJS) -o $(BIN)/notecase $(FLAGS) $(LDFLAGS) $(GTKLIBS)
-	strip $(BIN)/notecase
+#	strip $(BIN)/notecase
 
 # compile individual objects
 
@@ -257,7 +257,7 @@
 	sed -i 's/Version:.*/Version: $(VERSION)/' ./docs/notecase.spec
 	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
-	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 system (under construction!!!)

Attachment: signature.asc
Description: This is a digitally signed message part


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]