update

svn: r3086
2004-04-11 02:39:27 +00:00 · 2004-04-11 02:39:27 +00:00 · 358056716f
commit 358056716f
parent 245fa23f64
5 changed files with 6 additions and 8 deletions
--- a/gramps2/gramps-mdk.spec
+++ b/gramps2/gramps-mdk.spec
@ -1,5 +1,5 @@
 %define ver      1.1.0
-%define rel      0.CVS20040407
+%define rel      0.CVS20040410
 %define prefix   /usr
 %define localstatedir /var/lib
 # Ensure that internal RPM macros for configure & makeinstall 
--- a/gramps2/gramps.spec
+++ b/gramps2/gramps.spec
@ -1,5 +1,5 @@
 %define ver      1.1.0
-%define rel      0.CVS20040407
+%define rel      0.CVS20040410
 %define prefix   /usr
 %define localstatedir /var/lib
 # Ensure that internal RPM macros for configure & makeinstall 
--- a/gramps2/src/Makefile.am
+++ b/gramps2/src/Makefile.am
@ -94,8 +94,7 @@ GLADEFILES = \
 	gramps.glade\
 	mergedata.glade\
 	plugins.glade\
-	rule.glade\
-	styles.glade
+	rule.glade

 GRAPHICS = \
 	bad.png\
--- a/gramps2/src/Makefile.in
+++ b/gramps2/src/Makefile.in
@ -206,8 +206,7 @@ GLADEFILES = \
 	gramps.glade\
 	mergedata.glade\
 	plugins.glade\
-	rule.glade\
-	styles.glade
+	rule.glade


 GRAPHICS = \
@ -227,7 +226,7 @@ GRAPHICS = \


 # Other stuff that we need to install
-dist_pkgdata_DATA = $(GLADEFILES) $(GRAPHICS) gramps.desktop papersize.xml
+dist_pkgdata_DATA = $(GLADEFILES) $(GRAPHICS) gramps.desktop
 subdir = src
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--- a/gramps2/src/data/Makefile.in
+++ b/gramps2/src/data/Makefile.in
@ -112,7 +112,7 @@ target_alias = @target_alias@
 # This is the src/data level Makefile
 SUBDIRS = templates

-pkgdata_DATA = gedcom.xml 
+pkgdata_DATA = gedcom.xml papersize.xml

 EXTRA_DIST = $(pkgdata_DATA)
 subdir = src/data