diff --git a/gramps2/gramps-mdk.spec b/gramps2/gramps-mdk.spec index fab7483f7..b0c86d9b5 100644 --- 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 diff --git a/gramps2/gramps.spec b/gramps2/gramps.spec index e5a1186d6..426631a8f 100644 --- 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 diff --git a/gramps2/src/Makefile.am b/gramps2/src/Makefile.am index 2e9c047fd..c1cd8fe7b 100644 --- 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\ diff --git a/gramps2/src/Makefile.in b/gramps2/src/Makefile.in index d3dab7d72..2ecee42a1 100644 --- 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 diff --git a/gramps2/src/data/Makefile.in b/gramps2/src/data/Makefile.in index 4ba009ade..19f663930 100644 --- 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