rpms/lyx/devel .cvsignore, 1.10, 1.11 lyx.spec, 1.31, 1.32 sources, 1.11, 1.12

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	.cvsignore lyx.spec sources 
Log Message:
* Tue Apr 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.1-1
- 1.4.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	8 Mar 2006 19:45:52 -0000	1.10
+++ .cvsignore	11 Apr 2006 14:35:26 -0000	1.11
@@ -1,2 +1,3 @@
 lyx-1.4.0.tar.bz2
 beamer.layout
+lyx-1.4.1.tar.bz2


Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- lyx.spec	30 Mar 2006 18:42:06 -0000	1.31
+++ lyx.spec	11 Apr 2006 14:35:26 -0000	1.32
@@ -1,8 +1,8 @@
 
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
-Version: 1.4.0
-Release: 5%{?dist}
+Version: 1.4.1
+Release: 1%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
@@ -12,6 +12,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 Patch1: lyx-1.4.0-helpers.patch
+Patch2: lyx-1.4.0-boost.patch
 
 # app-wrapper for various frontends
 Source10: lyx.sh
@@ -38,6 +39,7 @@
 BuildRequires: zlib-devel
 BuildRequires: tetex-latex
 BuildRequires: tetex-fonts
+%{?_without_included_boost:BuildRequires: boost-devel >= 1.33.0}
 
 # For texhash
 Requires(post): tetex-fonts
@@ -91,6 +93,7 @@
 %setup -q -n %{name}-%{version}%{?beta}
 
 %patch1 -p1 -b .helpers
+%{?_without_included_boost:%patch2 -p1 -b .boost}
 
 
 %build
@@ -111,6 +114,7 @@
   --enable-optimization="%{optflags}" \
   --with-aiksaurus \
   --with-aspell \
+  %{?_without_included_boost} \
   --without-warnings --disable-dependency-tracking \
   --disable-debug --disable-stdlib-debug --disable-assertions --disable-concept-checks 
 
@@ -195,6 +199,9 @@
 
 
 %changelog
+* Tue Apr 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.1-1
+- 1.4.1
+
 * Thu Mar 30 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-5
 - %%trigger ImageMagick (#186319)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	8 Mar 2006 19:45:52 -0000	1.11
+++ sources	11 Apr 2006 14:35:26 -0000	1.12
@@ -1,2 +1,2 @@
-5ab37471339ff7dbc8f0c43282746cb0  lyx-1.4.0.tar.bz2
 c906271900a0627d3df2a38ad962a285  beamer.layout
+368696695a05e428773626e3b0f8ae74  lyx-1.4.1.tar.bz2