rpms/beryl-settings/FC-6 beryl-settings.spec,1.5,1.6

[Jarod Wilson (jwilson)]

Author: jwilson

Update of /cvs/extras/rpms/beryl-settings/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3961

Modified Files:
	beryl-settings.spec 
Log Message:
Fix up pkg-config search path so this actually builds...


Index: beryl-settings.spec
===================================================================
RCS file: /cvs/extras/rpms/beryl-settings/FC-6/beryl-settings.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- beryl-settings.spec	5 Feb 2007 16:18:55 -0000	1.5
+++ beryl-settings.spec	5 Feb 2007 16:45:18 -0000	1.6
@@ -56,7 +56,7 @@
 make %{?_smp_mflags}
 popd
 # beryl-settings
-export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$RPM_BUILD_ROOT/beryl-settings-bindings-%{version}/
+export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$RPM_BUILD_DIR/%{name}-%{version}/%{name}-bindings-%{version}/
 %configure
 make %{?_smp_mflags}
 # beryl-settings-simple
@@ -68,20 +68,23 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+# beryl-settings-bindings
 pushd beryl-settings-bindings-%{version}
 make DESTDIR=$RPM_BUILD_ROOT install
 popd
-pushd beryl-settings-simple-%{version}
+# beryl-settings
 make DESTDIR=$RPM_BUILD_ROOT install
-popd
-find $RPM_BUILD_ROOT -type f -name "*.a" -o -name "*.la" | xargs rm -f
 desktop-file-install --vendor fedora --delete-original \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category X-Fedora %{name}.desktop
+# beryl-settings-simple
+pushd beryl-settings-simple-%{version}
+make DESTDIR=$RPM_BUILD_ROOT install
 desktop-file-install --vendor fedora --delete-original \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora %{name}-simple-%{version}/%{name}-simple.desktop
+  --add-category X-Fedora %{name}-simple.desktop
+popd
+find $RPM_BUILD_ROOT -type f -name "*.a" -o -name "*.la" | xargs rm -f
 %find_lang %{name}
 %find_lang %{name}-simple